]> Pileus Git - ~andy/linux/commitdiff
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)
Conflicts:
arch/arm/kernel/module.c
arch/arm/mach-s5pv210/sleep.S


No differences found