Please do a bk pull bk://gkernel.bkbits.net/net-drivers-2.6 This will update the following files: drivers/net/b44.c | 36 +++--- drivers/net/b44.h | 3 drivers/net/e1000/e1000.h | 1 drivers/net/e1000/e1000_main.c | 21 +++ drivers/net/macsonic.c | 1 drivers/net/pcnet32.c | 3 drivers/net/s2io-regs.h | 2 drivers/net/s2io.c | 245 +++++++++++++++++++---------------------- drivers/net/s2io.h | 119 ------------------- include/linux/pci_ids.h | 2 10 files changed, 167 insertions(+), 266 deletions(-) through these ChangeSets: : o fix Jazzsonic driver build on m68k John W. Linville: o e1000: add MODULE_VERSION o b44: allocate tx bounce bufs as needed o e1000: flush work queues on remove o e1000: avoid sleeping in watchdog timer context Ravinandan Arakali: o S2io: Changed copyright and added support for Xframe II o S2io: h/w initialization fixes o S2io: Statistics fix Steven HARDY: o pcnet32: 79C975 fiber fix