commit | d7906de1d774ca70d696d3047223bb3e5e759d92 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Jan 05 15:55:49 2006 -0800 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Jan 05 15:55:49 2006 -0800 |
tree | 6065caea25668f9fd33c23a24047cecb2c5b5cd7 | |
parent | fbd91ac22229fdb89f0dd2eaa11dd663f2ba1a92 [diff] | |
parent | 725a6abfe37025975c125ace1c7da35f27ce5384 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6