tree 481ed6efd0babe7185cae04f2fd295426b36411d
parent e4707dd3e9d0cb57597b6568a5e51fea5d6fca41
parent 148854c65ea8046b045672fd49f4333aefaa3ab5
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1236980691 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1236980691 +0000

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

Conflicts:

	arch/arm/mach-at91/gpio.c