git.hungrycats.org Git - linux/commit

]> git.hungrycats.org Git - linux/commit

projects / linux / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 88f9b94 1970654)

author	Jeff Garzik <jgarzik@redhat.com>
	Mon, 19 Jan 2004 13:38:11 +0000 (08:38 -0500)
committer	Jeff Garzik <jgarzik@redhat.com>
	Mon, 19 Jan 2004 13:38:11 +0000 (08:38 -0500)
commit	5747eaf7280183ba8d1de092d737d01f21624af7
tree	b6508cc1e87e172fd2ce45b3a497831381ca9556	tree \| snapshot
parent	88f9b940a7f1aca27fd63e20e66b1b8d1b2388e6	commit \| diff
parent	1970654bf3057be52f250afaf362babc6df15b2a	commit \| diff

Merge redhat.com:/spare/repo/netdev-2.6/netdev-alloc-4
into redhat.com:/spare/repo/netdev-2.6/netdev-alloc-5

12 files changed:

drivers/char/pcmcia/synclink_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/ieee1394/eth1394.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/axnet_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/ibmtr_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/pcnet_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sk98lin/skge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tokenring/olympic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/orinoco_pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl3501_cs.c	diff1 \|	diff2 \|	blob \| history
net/atm/clip.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_if.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history

Linux kernels and configurations used by Zygo.