Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 13 Mar 2009 21:44:51 +0000 (21:44 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 13 Mar 2009 21:44:51 +0000 (21:44 +0000)
commit97fb44eb6bc01f4ffed4300e475aa15e44877375
tree481ed6efd0babe7185cae04f2fd295426b36411d
parente4707dd3e9d0cb57597b6568a5e51fea5d6fca41
parent148854c65ea8046b045672fd49f4333aefaa3ab5
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel

Conflicts:

arch/arm/mach-at91/gpio.c
13 files changed:
MAINTAINERS
arch/arm/kernel/setup.c
arch/arm/mach-at91/gpio.c
arch/arm/mm/mmu.c
arch/arm/plat-mxc/dma-mx1-mx2.c
drivers/input/keyboard/corgikbd.c
drivers/input/keyboard/spitzkbd.c
drivers/input/touchscreen/corgi_ts.c
drivers/media/video/pxa_camera.c
drivers/net/smc911x.h
drivers/video/Kconfig
drivers/video/pxafb.c
lib/Kconfig.debug