summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp/include/mach
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2012-10-014-39/+4
|\
| * Merge branch 'multiplatform/platform-data' into next/multiplatformOlof Johansson2012-09-224-39/+4
| |\
| | * ARM: pxa: move platform_data definitionsArnd Bergmann2012-09-144-39/+4
* | | Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-10-011-2/+10
|\ \ \ | |/ / |/| |
| * | ARM: mmp: implement DEBUG_LL port choiceHaojian Zhuang2012-08-161-2/+10
| |/
* / ARM: mmp: remove unused definition in APBC and APMUChao Xie2012-09-082-110/+0
|/
* ARM: mmp: remove mach/gpio-pxa.hPaul Bolle2012-07-041-29/+0
* Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-224-5/+262
|\
| * ARM: mmp: add usb host support for PXA168Neil Zhang2012-05-031-5/+3
| * ARM: mmp: add usb device support for PXA910Neil Zhang2012-05-033-0/+259
* | ARM: mmp: add pm support for pxa910Chao Xie2012-05-071-0/+77
* | ARM: mmp: add PM support for mmp2Chao Xie2012-05-071-0/+61
* | ARM: mmp: move XX_REG definition to addr-map.hChao Xie2012-05-073-6/+12
* | ARM: mmp: support DT in irqHaojian Zhuang2012-05-052-9/+22
|/
* Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2012-03-292-27/+0
|\
| * ARM: create a common IOMEM definitionRob Herring2012-03-131-6/+0
| * ARM: remove bunch of now unused mach/io.h filesRob Herring2012-03-061-21/+0
* | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-291-2/+1
|\ \
| * \ Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into deve...Russell King2012-02-041-2/+1
| |\ \
| | * | ARM: mmp: remove NR_IRQSRob Herring2012-01-251-2/+1
* | | | Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-273-0/+25
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'rtc-sa1100' of git://github.com/hzhuang1/linux into next/driversArnd Bergmann2012-02-283-0/+25
| |\ \ \ | | |/ / | |/| |
| | * | ARM: mmp: enable rtc in pxa910Haojian Zhuang2012-02-283-0/+25
| | |/
* | | Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux ...Russell King2012-02-221-6/+0
|\ \ \ | |/ / |/| |
| * | ARM: remove disable_fiq and arch_ret_to_user macrosRob Herring2012-02-211-6/+0
| |/
* / ARM: big removal of now unused arch_idle()Nicolas Pitre2012-01-201-16/+0
|/
* Merge branch 'samsung/driver' into next/driversArnd Bergmann2012-01-093-15/+1
|\
| * Merge branch 'restart' into for-linusRussell King2012-01-052-10/+1
| |\
| | * ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| | * ARM: restart: mmp: use new restart hookRussell King2012-01-052-6/+1
| | * Merge branch 'restart-cleanup' into restartRussell King2012-01-051-1/+1
| | |\
| * | \ Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-s...Russell King2011-12-051-5/+0
| |\ \ \
| | * | | ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-5/+0
| * | | | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/...Russell King2011-12-051-1/+1
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| * | | ARM: restart: only perform setup for restart when soft-restartingRussell King2011-11-211-2/+2
| | |/ | |/|
* | | Merge branch 'mxs/saif' into next/driversArnd Bergmann2011-12-061-1/+1
|\ \ \ | | |/ | |/|
| * | ARM: mmp: fix build error on gpioHaojian Zhuang2011-11-141-1/+1
| |/
* | ARM: pxa: change gpio to platform deviceHaojian Zhuang2011-11-154-2/+7
* | ARM: pxa: rename NR_BUILTIN_GPIOHaojian Zhuang2011-11-143-6/+2
* | ARM: pxa: rename gpio_to_irq and irq_to_gpioHaojian Zhuang2011-11-143-3/+2
|/
* Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-052-0/+48
|\
| * ARM: mmp: register internal sram bankLeo Yan2011-10-251-0/+6
| * ARM: mmp: register audio sram bankLeo Yan2011-10-251-0/+7
| * ARM: mmp: add sram allocatorLeo Yan2011-10-251-0/+35
* | Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-012-3/+9
|\ \
| * \ Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-11-012-15/+1
| |\ \
| * \ \ Merge branch 'depends/rmk/gpio' into next/fixesArnd Bergmann2011-10-312-23/+30
| |\ \ \
| * | | | ARM: pxa: use correct __iomem annotationsArnd Bergmann2011-10-081-2/+8
| | |_|/ | |/| |
* | | | Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-282-15/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | ARM: mach-mmp: remove mach/memory.hNicolas Pitre2011-10-131-14/+0