Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Thu, 5 Jan 2006 00:31:56 +0000 (16:31 -0800)]
1  2 
drivers/net/sk98lin/skge.c
drivers/net/skge.c
drivers/net/wireless/ipw2200.c
net/core/dev.c

Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge