summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'samsung/driver' into next/driversArnd Bergmann2012-01-0916-28/+25
|\
| * Merge branch 'restart' into for-linusRussell King2012-01-0514-10/+22
| |\
| | * ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| | * ARM: restart: mmp: use new restart hookRussell King2012-01-0514-6/+22
| | * Merge branch 'restart-cleanup' into restartRussell King2012-01-052-2/+2
| | |\
| * | | ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtimeMarc Zyngier2011-12-181-13/+3
| * | | 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-052-2/+2
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| * | | ARM: restart: only perform setup for restart when soft-restartingRussell King2011-11-211-2/+2
| | |/ | |/|
* | | Merge branch 'mxs/saif' into next/driversArnd Bergmann2011-12-062-2/+2
|\ \ \ | | |/ | |/|
| * | ARM: pxa168/gplugd: add the correct SSP deviceEric Miao2011-11-171-1/+1
| * | ARM: mmp: fix build error on gpioHaojian Zhuang2011-11-141-1/+1
| |/
* | Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/driversArnd Bergmann2011-11-231-2/+3
|\ \ | |/
| * Merge git://git.infradead.org/mtd-2.6Linus Torvalds2011-11-071-2/+3
| |\
| | * mtd: pxa3xx_nand: enable multiple chip select supportLei Wen2011-09-111-2/+3
* | | ARM: pxa: add clk support in gpio driverHaojian Zhuang2011-11-153-27/+6
* | | ARM: pxa: change gpio to platform deviceHaojian Zhuang2011-11-1515-29/+74
* | | ARM: pxa: rename NR_BUILTIN_GPIOHaojian Zhuang2011-11-145-9/+7
* | | ARM: pxa: rename gpio_to_irq and irq_to_gpioHaojian Zhuang2011-11-147-10/+9
|/ /
* | Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-056-1/+231
|\ \
| * | ARM: mmp: register internal sram bankLeo Yan2011-10-253-0/+14
| * | ARM: mmp: register audio sram bankLeo Yan2011-10-253-0/+13
| * | ARM: mmp: add sram allocatorLeo Yan2011-10-253-1/+204
| |/
* | Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-018-13/+20
|\ \
| * \ Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-11-012-15/+1
| |\ \
| * \ \ Merge branch 'depends/rmk/gpio' into next/fixesArnd Bergmann2011-10-3110-36/+38
| |\ \ \
| * | | | ARM: mmp: rename SHEEVAD to GPLUGDEric Miao2011-10-253-3/+3
| * | | | ARM: pxa: use correct __iomem annotationsArnd Bergmann2011-10-084-9/+16
| | |_|/ | |/| |
* | | | 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
| * | | ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-261-1/+1
| |/ /
* | | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-2710-36/+38
|\ \ \ | | |/ | |/|
| * | ARM: 7104/1: plat-pxa: break out GPIO driver specificsLinus Walleij2011-10-0110-29/+36
| * | ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.hRussell King2011-08-085-10/+5
* | | Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2011-10-252-0/+53
|\ \ \
| * | | USB: pxa168: Add onchip USB host controller supportTanmay Upadhyay2011-08-222-0/+53
| | |/ | |/|
* | | ARM: 7022/1: allow to detect conflicting zreladdrsSascha Hauer2011-10-171-1/+1
* | | ARM: 7006/1: Migrate to asm-generic wrapper supportStephen Boyd2011-10-172-2/+2
|/ /
* | ARM: mmp: Change the way we use timer 0 as clockevent timer.Lennert Buytenhek2011-08-111-12/+35
* | ARM: mmp: Switch to using timer 1 as clocksource timer.Lennert Buytenhek2011-08-111-2/+2
* | ARM: mmp: Also start timer 1 on boot.Lennert Buytenhek2011-08-111-6/+9
* | ARM: pxa168/gplugd: free correct GPIOTanmay Upadhyay2011-08-111-2/+2
* | ARM: pxa168/gplugd: get rid of mfp-gplugd.hTanmay Upadhyay2011-08-113-62/+45
|/
* Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-07-2611-1/+329
|\
| * ARM: mmp/dkb: enable max7312 gpio expanderHaojian Zhuang2011-07-121-1/+30
| * ARM: pxa168: Add board support for gplugDTanmay Upadhyay2011-07-124-0/+249
| * ARM: pxa168: Add support for EthernetTanmay Upadhyay2011-07-124-0/+29
| * ARM: pxa168: Add support for UART3Tanmay Upadhyay2011-07-122-0/+5
| * ARM: pxa: add clk_set_rate()Haojian Zhuang2011-07-122-0/+16
OpenPOWER on IntegriCloud