summaryrefslogtreecommitdiff
path: root/drivers/net/tokenring/ibmtr_cs.c
AgeCommit message (Expand)Author
2012-04-07Merge branch '3.4-rc1' into android-tegra-nv-3.3-rebasedVarun Wadekar
2011-08-27ixbmtr_cs: Move the IBM PCMCIA Token Ring driverJeff Kirsher