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
..
dma.h	[ARM] pxa: introduce plat-pxa for PXA common code and add DMA support	2009-03-23 10:11:31 +08:00
gpio.h	[ARM] pxa: move common GPIO handling code into plat-pxa	2009-03-23 10:11:33 +08:00
i2c.h	[ARM] pxa: move mach/i2c.h to plat/i2c.h	2009-06-05 10:32:01 +08:00
mfp.h	[ARM] mmp: update mfp setting	2010-05-11 17:25:05 +02:00
pxa3xx_nand.h	mtd: pxa3xx_nand: condense the flash definition	2010-10-24 23:38:47 +01:00
pxa27x_keypad.h	ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts	2010-10-09 17:07:19 +08:00
ssp.h	[ARM] pxa: add namespace on ssp	2010-05-11 17:25:06 +02:00