Russell King 4073723acb Merge branch 'misc' into devel ...

Conflicts:
	arch/arm/Kconfig
	arch/arm/common/Makefile
	arch/arm/kernel/Makefile
	arch/arm/kernel/smp.c

2011-01-06 22:32:52 +00:00

..

mach

Merge branch 'misc' into devel

2011-01-06 22:32:52 +00:00