summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/sa1100_shannon.c
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2011-05-29 14:27:13 -0400
committerMatthew Garrett <mjg@redhat.com>2011-05-29 14:27:13 -0400
commit437cb0dbd104a1564e0e78f0d486b97677f80909 (patch)
treee066b3d65eb965ca68ecc8ef14581f2450ad3a61 /drivers/pcmcia/sa1100_shannon.c
parent139f37f5e14cd883eee2a8a36289f544b5390a44 (diff)
parent987dfbaa65b2c3568b85e29d2598da08a011ee09 (diff)
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'drivers/pcmcia/sa1100_shannon.c')
0 files changed, 0 insertions, 0 deletions