commit | 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Jan 12 14:00:47 2006 -0800 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Jan 12 14:00:47 2006 -0800 |
tree | 9aedb8e87eba92dc203aa169d4f7459a21be9e34 | |
parent | 37ef4399a6bb265d3035e6d6e45f7677b132a3ba [diff] | |
parent | db1019ca0548b263989bc98900eaf15107e533ad [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6