Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 27 Sep 2005 01:31:36 +0000 (18:31 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 27 Sep 2005 01:31:36 +0000 (18:31 -0700)
commitbf0cbb3e4264e9d6493af757f63d4b0527d21eab
tree61903263aa73f98d0d6d7fbc77013080b0eb8856
parent0b1556945475e8529328edf98ff0d201ed133edb
parent4fb7edce52e5b6cf41e3375822d74a27f0b6f2dd
Merge /linux/kernel/git/brodo/pcmcia-fixes-2.6