Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/ehea/ehea_main.c
	drivers/net/wireless/iwlwifi/Kconfig
	drivers/net/wireless/rt2x00/rt61pci.c
	net/ipv4/inet_timewait_sock.c
	net/ipv6/raw.c
	net/mac80211/ieee80211_sta.c

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 19ddd2bd1057..6ce92e82b64e 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1190,6 +1190,12 @@ int ssb_bus_may_powerdown(struct ssb_bus *bus)
                 goto out;
 
         cc = &bus->chipco;
+
+        if (!cc->dev)
+                goto out;
+        if (cc->dev->id.revision < 5)
+                goto out;
+
         ssb_chipco_set_clockmode(cc, SSB_CLKMODE_SLOW);
         err = ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 0);
         if (err)