diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 22:07:22 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 22:07:22 +0400 |
| commit | 1543966a079fc7065849ae43ca4dd767c188ad55 (patch) | |
| tree | 760ddb82836a4e3edf314227c731d5dc181d11a7 /drivers/pcmcia/Kconfig | |
| parent | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (diff) | |
| parent | 4e9687d9c843dc34d368358a36f5f1610e4fbab3 (diff) | |
| download | linux-1543966a079fc7065849ae43ca4dd767c188ad55.tar.xz | |
Merge branch 'pxa-palm' into pxa-machines
Conflicts:
drivers/mfd/Kconfig
drivers/pcmcia/Makefile
Diffstat (limited to 'drivers/pcmcia/Kconfig')
0 files changed, 0 insertions, 0 deletions