22a94f68cde70e820dc7280d1c731e8e695f7
author Russell King <rmk+kernel@arm.linux.org.uk> 1303890181 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1303890181 +0100

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
´Ôq<Ÿ$x