Merge branch 'devel-stable' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 31 Jul 2010 13:20:16 +0000 (14:20 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 31 Jul 2010 13:20:16 +0000 (14:20 +0100)
commit7b70c4275f28702b76b273c8534c38f8313812e9
tree1df2229ca02466bd1adda814ac5c37aa0a597db1
parentceb0885d3b01bb2e2f18765770e212914f2864be
parenta20df564d15bd28e3df24e1c65b885bd74d23f17
Merge branch 'devel-stable' into devel

Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/kernel/setup.c
arch/arm/mm/init.c
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/compressed/Makefile
arch/arm/kernel/Makefile
arch/arm/kernel/entry-armv.S
arch/arm/kernel/process.c
arch/arm/kernel/setup.c
arch/arm/mm/init.c