]> err.no Git - linux-2.6/commit
Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 4 Oct 2005 02:06:19 +0000 (22:06 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 4 Oct 2005 02:06:19 +0000 (22:06 -0400)
commit3c8c7b2f32c52b259daa7564fefd582146799b23
tree59ff1ad0d6b7821d474d8fccafd884703684b6d7
parent7cb3cd090c2725b80561958a362c2ba15a7a8c86
parent9123e0d78990246304fe681167b8d8097f1e02d7
Merge branch 'upstream-fixes'
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/ns83820.c
drivers/net/r8169.c
drivers/net/skge.c
drivers/net/wan/syncppp.c
include/linux/netdevice.h
net/ieee80211/ieee80211_module.c
net/ieee80211/ieee80211_tx.c