]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70ced8b 41c5d53)
Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia
authorLinus Torvalds <torvalds@home.transmeta.com>
Wed, 23 Apr 2003 08:35:33 +0000 (01:35 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Wed, 23 Apr 2003 08:35:33 +0000 (01:35 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
drivers/pcmcia/rsrc_mgr.c patch | diff1 | diff2 | blob | history

diff --cc drivers/pcmcia/rsrc_mgr.c
Simple merge
Linux kernels and configurations used by Zygo.