]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'p2v' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 16 Mar 2011 23:35:27 +0000 (23:35 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 16 Mar 2011 23:35:27 +0000 (23:35 +0000)
commit0140ba868b8cc80861fae8af5f8d11827b21d538
tree318d321262269eff585573ab2acf04a2ff2b65f4
parent85194cb4a103d3d09d2b35f44dfb34f73d15740d
parentaa9108b7407a4d28a4cd895065909aafeeb9f62f
Merge branch 'p2v' into devel

Conflicts:
arch/arm/kernel/module.c
arch/arm/mach-s5pv210/sleep.S
arch/arm/Kconfig
arch/arm/kernel/armksyms.c
arch/arm/kernel/head.S
arch/arm/kernel/module.c
arch/arm/kernel/setup.c
arch/arm/kernel/vmlinux.lds.S