tree 33e865edad4ed4cc1cbb9667717a7261123b5f2a
parent 64724ef8bd2a25aa91678c253a5dbfdad1a95662
parent 25971dfe3a9d14c3b91fc51de96d7f48da394c99
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1241511746 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1241511746 +0100

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