diff --git a/[refs] b/[refs]
index 570fe7dec852..78e3af923bd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 619baba195d92ec39379e24c151f4a640898d140
+refs/heads/master: 08c801f8d45387a1b46066aad1789a9bb9c4b645
diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c
index 46c69cd06553..1830f3199cb5 100644
--- a/trunk/drivers/net/gianfar.c
+++ b/trunk/drivers/net/gianfar.c
@@ -747,7 +747,8 @@ static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
 			FSL_GIANFAR_DEV_HAS_CSUM |
 			FSL_GIANFAR_DEV_HAS_VLAN |
 			FSL_GIANFAR_DEV_HAS_MAGIC_PACKET |
-			FSL_GIANFAR_DEV_HAS_EXTENDED_HASH;
+			FSL_GIANFAR_DEV_HAS_EXTENDED_HASH |
+			FSL_GIANFAR_DEV_HAS_TIMER;
 
 	ctype = of_get_property(np, "phy-connection-type", NULL);
 
diff --git a/trunk/drivers/net/phy/lxt.c b/trunk/drivers/net/phy/lxt.c
index dbd003453737..8ee929b796d8 100644
--- a/trunk/drivers/net/phy/lxt.c
+++ b/trunk/drivers/net/phy/lxt.c
@@ -53,9 +53,6 @@
 
 #define MII_LXT971_ISR		19  /* Interrupt Status Register */
 
-/* register definitions for the 973 */
-#define MII_LXT973_PCR 16 /* Port Configuration Register */
-#define PCR_FIBER_SELECT 1
 
 MODULE_DESCRIPTION("Intel LXT PHY driver");
 MODULE_AUTHOR("Andy Fleming");
@@ -122,33 +119,6 @@ static int lxt971_config_intr(struct phy_device *phydev)
 	return err;
 }
 
-static int lxt973_probe(struct phy_device *phydev)
-{
-	int val = phy_read(phydev, MII_LXT973_PCR);
-
-	if (val & PCR_FIBER_SELECT) {
-		/*
-		 * If fiber is selected, then the only correct setting
-		 * is 100Mbps, full duplex, and auto negotiation off.
-		 */
-		val = phy_read(phydev, MII_BMCR);
-		val |= (BMCR_SPEED100 | BMCR_FULLDPLX);
-		val &= ~BMCR_ANENABLE;
-		phy_write(phydev, MII_BMCR, val);
-		/* Remember that the port is in fiber mode. */
-		phydev->priv = lxt973_probe;
-	} else {
-		phydev->priv = NULL;
-	}
-	return 0;
-}
-
-static int lxt973_config_aneg(struct phy_device *phydev)
-{
-	/* Do nothing if port is in fiber mode. */
-	return phydev->priv ? 0 : genphy_config_aneg(phydev);
-}
-
 static struct phy_driver lxt970_driver = {
 	.phy_id		= 0x78100000,
 	.name		= "LXT970",
@@ -176,18 +146,6 @@ static struct phy_driver lxt971_driver = {
 	.driver 	= { .owner = THIS_MODULE,},
 };
 
-static struct phy_driver lxt973_driver = {
-	.phy_id		= 0x00137a10,
-	.name		= "LXT973",
-	.phy_id_mask	= 0xfffffff0,
-	.features	= PHY_BASIC_FEATURES,
-	.flags		= 0,
-	.probe		= lxt973_probe,
-	.config_aneg	= lxt973_config_aneg,
-	.read_status	= genphy_read_status,
-	.driver 	= { .owner = THIS_MODULE,},
-};
-
 static int __init lxt_init(void)
 {
 	int ret;
@@ -199,15 +157,9 @@ static int __init lxt_init(void)
 	ret = phy_driver_register(&lxt971_driver);
 	if (ret)
 		goto err2;
-
-	ret = phy_driver_register(&lxt973_driver);
-	if (ret)
-		goto err3;
 	return 0;
 
- err3:
-	phy_driver_unregister(&lxt971_driver);
- err2:
+ err2:	
 	phy_driver_unregister(&lxt970_driver);
  err1:
 	return ret;
@@ -217,7 +169,6 @@ static void __exit lxt_exit(void)
 {
 	phy_driver_unregister(&lxt970_driver);
 	phy_driver_unregister(&lxt971_driver);
-	phy_driver_unregister(&lxt973_driver);
 }
 
 module_init(lxt_init);
diff --git a/trunk/net/caif/cfrfml.c b/trunk/net/caif/cfrfml.c
index fd27b172fb5d..cd2830fec935 100644
--- a/trunk/net/caif/cfrfml.c
+++ b/trunk/net/caif/cfrfml.c
@@ -83,7 +83,7 @@ static int cfrfml_transmit(struct cflayer *layr, struct cfpkt *pkt)
 	if (!cfsrvl_ready(service, &ret))
 		return ret;
 
-	if (cfpkt_getlen(pkt) > CAIF_MAX_PAYLOAD_SIZE) {
+	if (!cfpkt_getlen(pkt) > CAIF_MAX_PAYLOAD_SIZE) {
 		pr_err("CAIF: %s():Packet too large - size=%d\n",
 			__func__, cfpkt_getlen(pkt));
 		return -EOVERFLOW;
diff --git a/trunk/net/caif/cfveil.c b/trunk/net/caif/cfveil.c
index e04f7d964e83..0fd827f49491 100644
--- a/trunk/net/caif/cfveil.c
+++ b/trunk/net/caif/cfveil.c
@@ -84,7 +84,7 @@ static int cfvei_transmit(struct cflayer *layr, struct cfpkt *pkt)
 		return ret;
 	caif_assert(layr->dn != NULL);
 	caif_assert(layr->dn->transmit != NULL);
-	if (cfpkt_getlen(pkt) > CAIF_MAX_PAYLOAD_SIZE) {
+	if (!cfpkt_getlen(pkt) > CAIF_MAX_PAYLOAD_SIZE) {
 		pr_warning("CAIF: %s(): Packet too large - size=%d\n",
 			   __func__, cfpkt_getlen(pkt));
 		return -EOVERFLOW;
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index d03470f5260a..14a85682af38 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2253,11 +2253,9 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,
 	if (skb_rx_queue_recorded(skb)) {
 		u16 index = skb_get_rx_queue(skb);
 		if (unlikely(index >= dev->num_rx_queues)) {
-			if (net_ratelimit()) {
-				pr_warning("%s received packet on queue "
-					"%u, but number of RX queues is %u\n",
-					dev->name, index, dev->num_rx_queues);
-			}
+			WARN_ONCE(dev->num_rx_queues > 1, "%s received packet "
+				"on queue %u, but number of RX queues is %u\n",
+				dev->name, index, dev->num_rx_queues);
 			goto done;
 		}
 		rxqueue = dev->_rx + index;