tree a434977a6caa9b41cc0daaf71dbd76ac8693aba6
parent b93a4afcff7be859e30cad2a305731516057d6cf
parent 17ccb834d517c66c09123c24ba8553c5b14e0f78
author Russell King <rmk+kernel@arm.linux.org.uk> 1267572667 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1267572667 +0000

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable

Conflicts:
	arch/arm/Kconfig