]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'devel-stable' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 27 Mar 2012 10:30:31 +0000 (11:30 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 27 Mar 2012 10:30:31 +0000 (11:30 +0100)
commit617336af5bf7f9927f4dbe60908e5146629eda78
tree6800388c633a13f64fd1f7845ce026ca2606522f
parentb5c99ad9ba8f03ae4f9db7a9e68363eb028b26c3
parenta2cf5e28787d1eeda23d3643efc10e6ae116708e
Merge branch 'devel-stable' into for-linus

Conflicts:
arch/arm/Kconfig.debug
arch/arm/plat-versatile/Kconfig
Merge fixes:
arch/arm/mach-integrator/Kconfig
drivers/clocksource/Kconfig
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/include/asm/system.h
arch/arm/kernel/Makefile
arch/arm/kernel/process.c
arch/arm/mach-integrator/core.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/plat-versatile/Kconfig
drivers/clocksource/Kconfig