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
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
dma.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
irq.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
riscpc.c	ARM: io: RiscPC: make EASI_BASE a void iomem pointer	2011-08-17 08:44:16 +01:00