]> git.hungrycats.org Git - linux/commit
Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia
authorLinus Torvalds <torvalds@home.osdl.org>
Thu, 22 Jan 2004 01:46:23 +0000 (17:46 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Thu, 22 Jan 2004 01:46:23 +0000 (17:46 -0800)
commit2004bed7eae90b5cae513bc711c038a850d17f73
treeea8bc5182b23f47aac46d1eee1a2a197f6e4a607
parent2e18152b97d33c7692e8d6a08c495c1ecde0af86
parentf2f9960d51e607ce01c9a890ce82fe3e5ab6667b
Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia
into home.osdl.org:/home/torvalds/v2.5/linux