diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-10 00:33:03 +0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-10 00:33:03 +0400 |
commit | b1add0480a95b6ceaece5caf6c50614771eae9b2 (patch) | |
tree | 06f969f37bd0f51d9ebcccdb3e3ae983edaad889 /drivers/pcmcia | |
parent | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (diff) | |
parent | 58a85f465fb16a918a869eba05addb8f78d9e064 (diff) | |
download | linux-b1add0480a95b6ceaece5caf6c50614771eae9b2.tar.xz |
Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git
Merge branch 'imx-devel' into devel
Diffstat (limited to 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions