Russell King ac1d426e82 Merge branch 'devel-stable' into devel ...

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/system.h
	arch/arm/mm/Kconfig

2010-05-17 17:24:04 +01:00

..

bus.h

ARM: 5999/1: Including device.h and resource.h header files in linux/amba/bus.h

2010-03-29 17:33:31 +01:00

clcd.h

…

kmi.h

…

mmci.h

ARM: 6033/1: ARM: MMCI: pass max frequency from platform

2010-04-14 16:08:18 +01:00

pl022.h

…

pl061.h

ARM: 6003/1: removing compilation warning from pl061.h

2010-03-29 17:33:33 +01:00

pl093.h

…

serial.h

…