]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92c06c6 b528e0d)
Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 15 Mar 2004 04:27:54 +0000 (20:27 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 15 Mar 2004 04:27:54 +0000 (20:27 -0800)
into ppc970.osdl.org:/home/torvalds/v2.5/linux


Trivial merge
Linux kernels and configurations used by Zygo.