Russell King bdf4e94823 Merge branch 'misc' into for-linus ... Conflicts: arch/arm/mach-integrator/integrator_ap.c		2011-10-25 08:19:59 +01:00
..
include/mach	ARM: io: RiscPC: eliminate private inb() et.al. definitions	2011-08-17 08:44:16 +01:00
dma.c
irq.c
Makefile
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
riscpc.c	ARM: io: RiscPC: make EASI_BASE a void iomem pointer	2011-08-17 08:44:16 +01:00