Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 23:55:49 +0000 (15:55 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 23:55:49 +0000 (15:55 -0800)
commitd7906de1d774ca70d696d3047223bb3e5e759d92
tree6065caea25668f9fd33c23a24047cecb2c5b5cd7
parentfbd91ac22229fdb89f0dd2eaa11dd663f2ba1a92
parent725a6abfe37025975c125ace1c7da35f27ce5384
Merge git://git./linux/kernel/git/brodo/pcmcia-2.6