]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33b0131 3c720f5)
Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 10 Oct 2004 02:49:59 +0000 (19:49 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 10 Oct 2004 02:49:59 +0000 (19:49 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge
Linux kernels and configurations used by Zygo.