Merge

diff --cc drivers/net/b44.c
index bad611b74906aa0b3e339cd8f35d4634d62996d6,9a4e0649677918eb45fb7ef109be125abdc3cdb9..f6fd4090a0cec0d68bd051289a277c84f6f9a8a3
--- 1/drivers/net/b44.c
--- 2/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@@ -77,13 -74,14 +77,14 @@@
  static char version[] __devinitdata =
        DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
  
 -MODULE_AUTHOR("David S. Miller (davem@redhat.com)");
 +MODULE_AUTHOR("Florian Schirmer, Pekka Pietikainen, David S. Miller");
  MODULE_DESCRIPTION("Broadcom 4400 10/100 PCI ethernet driver");
  MODULE_LICENSE("GPL");
 -MODULE_PARM(b44_debug, "i");
 -MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value");
+ MODULE_VERSION(DRV_MODULE_VERSION);
  
  static int b44_debug = -1;    /* -1 == use B44_DEF_MSG_ENABLE as value */
 +module_param(b44_debug, int, 0);
 +MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value");
  
  static struct pci_device_id b44_pci_tbl[] = {
        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401,