]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'v3.2-rc7' into next/pm
authorArnd Bergmann <arnd@arndb.de>
Tue, 3 Jan 2012 20:27:45 +0000 (20:27 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 3 Jan 2012 20:27:45 +0000 (20:27 +0000)
commit0a9de94082bdedf7538f9ab044239bdae51cdab5
treec60bdca0529cbd44d32b3918b78d14e182ef57cd
parent79669410cf79ff13ed2a32ecf0182112baa09acc
parent3136f538f42a91cc79e2085ca8a35b4a0836e71d
Merge branch 'v3.2-rc7' into next/pm

Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
arch/arm/kernel/perf_event.c
arch/arm/kernel/setup.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/mach-shmobile/board-kota2.c
mm/vmalloc.c