]> git.kernelconcepts.de Git - karo-tx-linux.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)
commit5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72
treec60bdca0529cbd44d32b3918b78d14e182ef57cd
parent3b0d597139efddfd8960b44249b4a4c977d172f1
parent5f0a6e2d503896062f641639dacfe5055c2f593b
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