]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 00f0340 5c26f69)
Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 25 Aug 2004 08:50:08 +0000 (01:50 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 25 Aug 2004 08:50:08 +0000 (01:50 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge
Linux kernels and configurations used by Zygo.