Arnd Bergmann dcf7ec5ee6 Merge branch 'samsung/driver' into next/drivers ... Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 16:16:29 +00:00
..
addr-map.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
cputype.h	ARM: mmp: fix cpuid detection on mmp2	2010-11-03 23:11:16 +08:00
debug-macro.S	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
devices.h	[ARM] mmp: avoid devices.h being included multiple times	2010-08-05 14:34:45 +08:00
dma.h	[ARM] pxa: add base support for Marvell's PXA168 processor line	2009-03-23 10:11:34 +08:00
entry-macro.S	[ARM] mmp: add support for Marvell MMP2	2010-03-02 07:40:55 +08:00
gpio-pxa.h	Merge branch 'mxs/saif' into next/drivers	2011-12-06 14:23:35 +00:00
gpio.h	ARM: pxa: change gpio to platform device	2011-11-15 19:08:27 +08:00
hardware.h	[ARM] pxa: add base support for Marvell's PXA168 processor line	2009-03-23 10:11:34 +08:00
io.h	[ARM] pxa: add base support for Marvell's PXA168 processor line	2009-03-23 10:11:34 +08:00
irqs.h	ARM: pxa: rename NR_BUILTIN_GPIO	2011-11-14 21:07:59 +08:00
mfp-mmp2.h	ARM: mmp: MMP2 drive strength FAST using wrong value	2011-01-15 04:29:19 -06:00
mfp-pxa168.h	ARM: pxa168/gplugd: get rid of mfp-gplugd.h	2011-08-11 10:10:43 +08:00
mfp-pxa910.h	ARM: mmp: PXA910 drive strength FAST using wrong value	2011-01-15 04:29:20 -06:00
mfp.h	[ARM] pxa: fix the incorrectly defined drive strength macros for pxa{168,910}	2009-05-22 18:15:31 +08:00
mmp2.h	ARM: pxa: change gpio to platform device	2011-11-15 19:08:27 +08:00
pxa168.h	Merge branch 'samsung/driver' into next/drivers	2012-01-09 16:16:29 +00:00
pxa910.h	ARM: pxa: change gpio to platform device	2011-11-15 19:08:27 +08:00
regs-apbc.h	[ARM] mmp: support ssp in pxa168	2010-05-11 17:24:59 +02:00
regs-apmu.h	ARM: pxa168: Add support for Ethernet	2011-07-12 19:50:36 +08:00
regs-icu.h	[ARM] mmp2: add missing ICU register definitions	2010-03-02 07:40:57 +08:00
regs-smc.h	[ARM] mmp: add smc registers definition	2010-05-11 17:25:06 +02:00
regs-timers.h	[ARM] pxa: add base support for Marvell's PXA168 processor line	2009-03-23 10:11:34 +08:00
sram.h	ARM: mmp: add sram allocator	2011-10-25 20:29:20 +08:00
system.h	ARM: restart: remove the now empty arch_reset()	2012-01-05 12:57:22 +00:00
teton_bga.h	ARM: pxa168: added support for Teton BGA platform	2010-10-09 17:07:26 +08:00
timex.h	[ARM] mmp: fix clock tick rate in mmp2	2010-05-11 17:25:05 +02:00
uncompress.h	ARM: zImage: remove the static qualifier from global data variables	2011-05-07 00:08:02 -04:00