tree 318d321262269eff585573ab2acf04a2ff2b65f4
parent bd1274dc005c2cee41771a7cc616f4709a6e6323
parent b511d75d6150892e67c8ebfa9dc8eb37ebd02aa3
author Russell King <rmk+kernel@arm.linux.org.uk> 1300318527 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1300318527 +0000

Merge branch 'p2v' into devel

Conflicts:
	arch/arm/kernel/module.c
	arch/arm/mach-s5pv210/sleep.S