]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 13 Dec 2011 08:53:08 +0000 (08:53 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 13 Dec 2011 08:53:08 +0000 (08:53 +0000)
commit17f2d402ec71f45a866643ca0e93157b12f2e190
tree085c25a879042489a229e27715391b50fa74bf71
parent3fe3d2c44613d20f23c1e68823756b66c9757ada
parent3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d
Merge branch 'devel-stable' into for-next

Conflicts:
arch/arm/kernel/setup.c
arch/arm/Kconfig
arch/arm/include/asm/pgtable.h
arch/arm/kernel/perf_event.c
arch/arm/kernel/setup.c
arch/arm/mm/fault.c
arch/arm/mm/proc-v7.S