diff options
| author |  Russell King <rmk@dyn-67.arm.linux.org.uk>
| 2008-07-10 16:41:50 +0100 |
|---|---|---|
| committer |  Russell King <rmk+kernel@arm.linux.org.uk>
| 2008-07-10 16:41:50 +0100 |
| commit | f0006314d37639714da9658cf4ff3f1f9f420764 (patch) | |
| tree | b8a18e014a40f2f8fd5148aab09c869dfaabd7a9 /drivers/pcmcia | |
| parent | Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'o... (diff) | |
| parent | i.MX2 family: Add basic mach support (diff) | |
| download | linux-f0006314d37639714da9658cf4ff3f1f9f420764.tar.gz linux-f0006314d37639714da9658cf4ff3f1f9f420764.tar.bz2 linux-f0006314d37639714da9658cf4ff3f1f9f420764.zip | |
Merge branch 'imx' into devel
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions