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
debug-macro.S
devices.h
dma.h
entry-macro.S
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
io.h
irqs.h	ARM: pxa: rename NR_BUILTIN_GPIO	2011-11-14 21:07:59 +08:00
mfp-mmp2.h
mfp-pxa168.h
mfp-pxa910.h
mfp.h
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
regs-apmu.h
regs-icu.h
regs-smc.h
regs-timers.h
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
timex.h
uncompress.h