commit | fe05f54181db868c5720cc4dc0741227b9ba5a60 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Mar 01 14:17:59 2006 -0800 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Mar 01 14:17:59 2006 -0800 |
tree | 922b7aaefa56cdd82f2152db57806a7a06dd6425 | |
parent | e5cef95d58d1e711b0bd6b00018278a06defb274 [diff] | |
parent | 67bc620006a30cf5dcbf409dbbd4fd93179ddfb1 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6