]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf6fdd97ae03f5e8cc50a4e5994586d3298517c26
tree1df2229ca02466bd1adda814ac5c37aa0a597db1
parentb4723567470ab9decdc324ff554ef5739b6fef55
parentebd75e8553f99670fef10845f7cb2fc5926c9f34
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