| commit | 97fb44eb6bc01f4ffed4300e475aa15e44877375 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Fri Mar 13 21:44:51 2009 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Fri Mar 13 21:44:51 2009 +0000 |
| tree | 481ed6efd0babe7185cae04f2fd295426b36411d | |
| parent | e4707dd3e9d0cb57597b6568a5e51fea5d6fca41 [diff] | |
| parent | 148854c65ea8046b045672fd49f4333aefaa3ab5 [diff] |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel Conflicts: arch/arm/mach-at91/gpio.c