From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 11 Oct 2011 03:58:03 +0000 (+1100)
Subject: Merge remote-tracking branch 'net-next/master'
X-Git-Tag: next-20111011~59
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c5646c325fcbbde42c19bb9277e670f708af2f18;p=karo-tx-linux.git

Merge remote-tracking branch 'net-next/master'

Conflicts:
	arch/powerpc/configs/40x/hcu4_defconfig
	drivers/s390/cio/qdio_main.c
---

c5646c325fcbbde42c19bb9277e670f708af2f18
diff --cc drivers/s390/cio/qdio_main.c
index a122c1c3320f,9a122280246c..7ded1b26fd25
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@@ -14,6 -14,8 +14,7 @@@
  #include <linux/timer.h>
  #include <linux/delay.h>
  #include <linux/gfp.h>
+ #include <linux/io.h>
 -#include <linux/kernel_stat.h>
  #include <linux/atomic.h>
  #include <asm/debug.h>
  #include <asm/qdio.h>