Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 5862282ab2fe..a86693906ac8 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -625,7 +625,7 @@ static int ibmveth_open(struct net_device *netdev)
         }
 
         ibmveth_debug_printk("registering irq 0x%x\n", netdev->irq);
-        if((rc = request_irq(netdev->irq, &ibmveth_interrupt, 0, netdev->name, netdev)) != 0) {
+        if((rc = request_irq(netdev->irq, ibmveth_interrupt, 0, netdev->name, netdev)) != 0) {
                 ibmveth_error_printk("unable to request irq 0x%x, rc %d\n", netdev->irq, rc);
                 do {
                         rc = h_free_logical_lan(adapter->vdev->unit_address);