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
arcom-pcmcia.h
audio.h
balloon3.h	ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ	2011-11-14 21:07:58 +08:00
bitfield.h
camera.h
colibri.h
corgi.h	ARM: pxa: rename NR_BUILTIN_GPIO	2011-11-14 21:07:59 +08:00
csb726.h	ARM: pxa: rename gpio_to_irq and irq_to_gpio	2011-11-14 21:07:59 +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
dma.h
entry-macro.S	ARM: Make global handler and CONFIG_MULTI_IRQ_HANDLER mutually exclusive	2011-11-15 18:13:03 +00:00
eseries-gpio.h
eseries-irq.h
gpio.h	ARM: pxa: change gpio to platform device	2011-11-15 19:08:27 +08:00
gumstix.h	ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ	2011-11-14 21:07:58 +08:00
h5000.h
hardware.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
hx4700.h	ARM: pxa: rename NR_BUILTIN_GPIO	2011-11-14 21:07:59 +08:00
idp.h	ARM: pxa: change gpio to platform device	2011-11-15 19:08:27 +08:00
io.h
irda.h
irqs.h	ARM: pxa: rename NR_BUILTIN_GPIO	2011-11-14 21:07:59 +08:00
littleton.h	ARM: pxa: change gpio to platform device	2011-11-15 19:08:27 +08:00
lpd270.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
lubbock.h
magician.h	ARM: pxa: rename NR_BUILTIN_GPIO	2011-11-14 21:07:59 +08:00
mainstone.h
mfp-pxa2xx.h
mfp-pxa3xx.h
mfp-pxa25x.h
mfp-pxa27x.h
mfp-pxa300.h
mfp-pxa320.h
mfp-pxa930.h
mfp.h
mioa701.h
mmc.h
mtd-xip.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
mxm8x10.h
ohci.h
palm27x.h	ARM: pxa: fix inconsistent CONFIG_USB_PXA27X	2011-11-10 15:32:27 +08:00
palmasoc.h
palmld.h	ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ	2011-11-14 21:07:58 +08:00
palmt5.h	ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ	2011-11-14 21:07:58 +08:00
palmtc.h	ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ	2011-11-14 21:07:58 +08:00
palmte2.h
palmtreo.h
palmtx.h	ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ	2011-11-14 21:07:58 +08:00
palmz72.h
pata_pxa.h
pcm027.h	ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ	2011-11-14 21:07:58 +08:00
pcm990_baseboard.h	ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ	2011-11-14 21:07:58 +08:00
pm.h
poodle.h	ARM: pxa: rename NR_BUILTIN_GPIO	2011-11-14 21:07:59 +08:00
pxa2xx-regs.h
pxa3xx-regs.h
pxa3xx-u2d.h
pxa3xx.h	ARM: pxa: enable MULTI_IRQ_HANDLER for all boards	2011-07-12 19:50:33 +08:00
pxa25x-udc.h
pxa25x.h	ARM: pxa: enable MULTI_IRQ_HANDLER for all boards	2011-07-12 19:50:33 +08:00
pxa27x-udc.h
pxa27x.h	ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available	2011-10-08 21:02:44 +08:00
pxa95x.h	ARM: pxa: pxa95x/saarb depends on pxa3xx code	2011-10-08 21:03:00 +08:00
pxa300.h	ARM: pxa: add common header file for pxa3xx	2011-07-12 19:45:20 +08:00
pxa320.h	ARM: pxa: add common header file for pxa3xx	2011-07-12 19:45:20 +08:00
pxa930.h	ARM: pxa: add common header file for pxa3xx	2011-07-12 19:45:20 +08:00
pxa930_rotary.h
pxa930_trkball.h
pxafb.h	ARM: pxa: make pxafb_smart_*() empty when not enabled	2011-10-08 21:03:04 +08:00
regs-ac97.h
regs-lcd.h
regs-ost.h
regs-rtc.h
regs-u2d.h
regs-uart.h
reset.h
sharpsl_pm.h
smemc.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
spitz.h	ARM: pxa: rename NR_BUILTIN_GPIO	2011-11-14 21:07:59 +08:00
system.h	ARM: restart: remove the now empty arch_reset()	2012-01-05 12:57:22 +00:00
timex.h
tosa.h	ARM: pxa: rename NR_BUILTIN_GPIO	2011-11-14 21:07:59 +08:00
tosa_bt.h
trizeps4.h	ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ	2011-11-14 21:07:58 +08:00
udc.h
uncompress.h
viper.h
vpac270.h
z2.h
zeus.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
zylonite.h	ARM: pxa: make zylonite_pxa*_init declaration match code	2011-10-08 21:02:57 +08:00