Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	net/bridge/br_device.c
	net/bridge/br_forward.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 80ff7d9e60de..7e5b8a8a64cc 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -834,6 +834,9 @@ int ssb_bus_pcibus_register(struct ssb_bus *bus,
         if (!err) {
                 ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
                            "PCI device %s\n", dev_name(&host_pci->dev));
+        } else {
+                ssb_printk(KERN_ERR PFX "Failed to register PCI version"
+                           " of SSB with error %d\n", err);
         }
 
         return err;