tree 63b1f3be2ed56ff06f1e8db709e4ce85d69c3add
parent 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4
parent a9ff8f6462635c8d9f8d64b7b10ddcea8404d77b
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1224108967 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1224108967 +0100

Merge branch 'fixes' into for-linus

Conflicts:

	arch/arm/mach-versatile/core.c