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)
commit05e34754518b6a90d5c392790c032575fab12d66
tree318d321262269eff585573ab2acf04a2ff2b65f4
parentbd1274dc005c2cee41771a7cc616f4709a6e6323
parentb511d75d6150892e67c8ebfa9dc8eb37ebd02aa3
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