David Woodhouse 67577927e8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ...

Conflicts:
	drivers/mtd/mtd_blkdevs.c

Merge Grant's device-tree bits so that we can apply the subsequent fixes.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

2010-10-30 12:35:11 +01:00

..

include/plat

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2010-10-30 12:35:11 +01:00

dma.c

arch/arm/plat-pxa/dma.c: correct NULL test

2010-05-01 11:33:00 +01:00

gpio.c

[ARM] pxa: use kzalloc() in pxa_init_gpio_chip()

2009-07-03 14:17:51 +08:00

Kconfig

[ARM] pxa: move ssp into common plat-pxa

2010-05-11 17:24:58 +02:00

Makefile

[ARM] pxa: move pmu device back into mach-pxa/

2010-08-05 14:32:19 +08:00

mfp.c

[ARM] pxa: allow MFP_LPM_INPUT to be explicitly specified

2010-05-11 17:25:00 +02:00

pwm.c

ARM: pxa: Make id const in pwm_probe()

2010-08-30 09:59:44 +08:00

ssp.c

[ARM] pxa: add namespace on ssp

2010-05-11 17:25:06 +02:00