linux-kernel-test/arch/arm/mach-ux500/include/mach
Arnd Bergmann 5839fec9d8 Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-10-31 23:11:53 +01:00
..
db5500-regs.h mach-ux500: update the DB5500 register file 2011-05-24 22:11:44 +02:00
db8500-regs.h mach-ux500: update the DB8500 register file 2011-05-24 22:11:43 +02: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 ux500: rework device registration 2010-12-08 13:14:06 +01:00
entry-macro.S ux500: remove build-time changing macros 2011-01-10 18:34:52 +01:00
gpio.h ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h> 2011-08-23 15:30:04 +01:00
hardware.h ARM: 6828/1: mach-ux500: delete SSP PrimeCell ID 2011-05-26 10:33:34 +01:00
id.h mach-ux500: update ASIC version detection 2011-05-24 22:11:46 +02:00
io.h
irqs-board-mop500.h mach-ux500: update SoC and board IRQ handling 2011-05-24 22:11:45 +02:00
irqs-board-u5500.h mach-ux500: update SoC and board IRQ handling 2011-05-24 22:11:45 +02:00
irqs-db5500.h mach-ux500: update SoC and board IRQ handling 2011-05-24 22:11:45 +02:00
irqs-db8500.h mach-ux500: update SoC and board IRQ handling 2011-05-24 22:11:45 +02:00
irqs.h mach-ux500: update SoC and board IRQ handling 2011-05-24 22:11:45 +02:00
mbox-db5500.h ux500: rename modem IRQ and MBOX files 2010-12-22 09:26:49 +01:00
setup.h ux500: dynamic SOC detection 2011-01-10 18:34:53 +01:00
system.h ARM: 5831/1: ARM: U8500 core machine support 2009-11-28 10:22:52 +00:00
timex.h ARM: 5831/1: ARM: U8500 core machine support 2009-11-28 10:22:52 +00:00
uncompress.h mach-ux500: setting proper uart for snowball 2011-06-23 12:04:55 +02:00
usb.h mach-ux500: add platform data for musb 2011-03-14 14:05:11 +01:00
vmalloc.h ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15 21:40:33 +00:00