Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 8b14c6eda7c3..f03e2e4a15a8 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -842,7 +842,7 @@ static int r6040_open(struct net_device *dev)
         int ret;
 
         /* Request IRQ and Register interrupt handler */
-        ret = request_irq(dev->irq, &r6040_interrupt,
+        ret = request_irq(dev->irq, r6040_interrupt,
                 IRQF_SHARED, dev->name, dev);
         if (ret)
                 return ret;
@@ -958,8 +958,7 @@ static void r6040_multicast_list(struct net_device *dev)
         }
         /* Too many multicast addresses
          * accept all traffic */
-        else if ((dev->mc_count > MCAST_MAX)
-                || (dev->flags & IFF_ALLMULTI))
+        else if ((dev->mc_count > MCAST_MAX) || (dev->flags & IFF_ALLMULTI))
                 reg |= 0x0020;
 
         iowrite16(reg, ioaddr);