diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-10 13:41:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-10 13:41:54 +1100 |
| commit | 34dd2960a0733e171c545b825a1762e725d36c89 (patch) | |
| tree | 63a44be0b63a16be8ec63d1248e26a3a2cd2b218 /drivers/ata/pata_atiixp.c | |
| parent | 93f065afb02acf25dafcd7ac359a8c9d448b07e7 (diff) | |
| parent | 638bba55fe6440439005f02fcd6b0c1f908d0d11 (diff) | |
Merge remote branch 'pcmcia/master'
Conflicts:
drivers/mtd/maps/pcmciamtd.c
drivers/pcmcia/Makefile
Diffstat (limited to 'drivers/ata/pata_atiixp.c')
0 files changed, 0 insertions, 0 deletions