Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 17 Dec 2008 20:04:45 +0000 (20:04 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 17 Dec 2008 20:04:45 +0000 (20:04 +0000)
commitc613bbba6f39c8804f1f26e96fb68a117cc9e282
tree85fbc24f26b61ce4e7a908d18952e3abc1f5cd10
parentcd4348339c21f4a15c01f3f120e92b3224a0a7da
parent80eee6bca4069c48247005aa07cb5e8e86042aa3
Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 into devel
arch/arm/kernel/armksyms.c
arch/arm/mm/fault.c