commit | 759979ab17512a061c3a3e870f091af27ccdcbfb | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Nov 10 09:48:34 2005 -0800 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Nov 10 09:48:34 2005 -0800 |
tree | a70792ce7f3fcf724b1be4e7e14edef8dc8ba77a | |
parent | 3ae0af12b458461f36dfddb26e54056be32928dd [diff] | |
parent | a2932b35a0efd01b20a3f598d19db052d64935f5 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6