From: Sascha Hauer Date: Thu, 4 Feb 2010 10:18:09 +0000 (+0100) Subject: Merge branch 'imx/master' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc... X-Git-Tag: v2.6.34-rc2~66^2~5^2^2~22 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9fd96bbb6a3a1fd9ba24e84a2d7ccc6ccb6beb60;p=karo-tx-linux.git Merge branch 'imx/master' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master --- 9fd96bbb6a3a1fd9ba24e84a2d7ccc6ccb6beb60