Merge branch 'imx-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
authorArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 20:26:57 +0000 (20:26 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 20:26:57 +0000 (20:26 +0000)
commitd92c9d5b38cd2932de463df1afa7a67fbf9207ef
treeeba58d615061927cb10ba5ab8ca3e68e8a01cf7f
parent4f778f56ee4f399439e401d45c1a76d72120a1f3
parent7378a62be238d4c12e7275e91a99adf6f5e8c7f0
Merge branch 'imx-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
arch/arm/plat-mxc/include/mach/common.h