Merge bk://gkernel.bkbits.net/net-drivers-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

diff --cc drivers/usb/gadget/ether.c
Simple merge

diff --cc drivers/usb/net/catc.c
Simple merge

diff --cc drivers/usb/net/kaweth.c
Simple merge

diff --cc drivers/usb/net/pegasus.c
Simple merge

diff --cc drivers/usb/net/rtl8150.c
Simple merge