]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'devel-stable' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 23 May 2011 18:28:04 +0000 (19:28 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 23 May 2011 18:28:04 +0000 (19:28 +0100)
commitc3c3ed9782f05c5b15feb6063934e8e2338b6b40
tree894bb6a3fb409c6ac5f0374f5a1f656918bc35cd
parente4884d82f1a7767d762d9c042ef55e0edfefc03d
parentfea6043030f48ad7e33394ada6ed9479e48ceb47
Merge branch 'devel-stable' into for-linus

Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/compressed/head.S
arch/arm/mach-mxs/Kconfig
arch/arm/plat-mxc/time.c
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/gpio.c