tree 6be77464bd07934a40959d68e5d08d75829bdc49
parent d7931d9f7ab9de9158c6905caae979999134ad4d
parent 88d27041cf4d36e499e2c54b6c44d9115ccf124a
author Russell King <rmk+kernel@arm.linux.org.uk> 1259948034 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1259948034 +0000

Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable

Conflicts:
	arch/arm/Kconfig