Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Mar 2006 22:17:59 +0000 (14:17 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Mar 2006 22:17:59 +0000 (14:17 -0800)
commitfe05f54181db868c5720cc4dc0741227b9ba5a60
tree922b7aaefa56cdd82f2152db57806a7a06dd6425
parente5cef95d58d1e711b0bd6b00018278a06defb274
parent67bc620006a30cf5dcbf409dbbd4fd93179ddfb1
Merge git://git./linux/kernel/git/brodo/pcmcia-fixes-2.6