tree b56d3c44f936739ad5c0d3d128b97b886d337d6b
parent c33de47bce74e0c890f9f830a7641371524edbc1
parent 9fbe604456c5ae21768f1c98379e1b81c72adcd3
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1221333059 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1221333075 +0100

Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git