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

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/ip6_tunnel.h b/include/linux/ip6_tunnel.h
index 5c23aeb104ca..af3f4a70f3df 100644
--- a/include/linux/ip6_tunnel.h
+++ b/include/linux/ip6_tunnel.h
@@ -25,7 +25,7 @@ struct ip6_tnl_parm {
         __u8 proto;             /* tunnel protocol */
         __u8 encap_limit;       /* encapsulation limit for tunnel */
         __u8 hop_limit;         /* hop limit for tunnel */
-        __u32 flowinfo;         /* traffic class and flowlabel for tunnel */
+        __be32 flowinfo;        /* traffic class and flowlabel for tunnel */
         __u32 flags;            /* tunnel flags */
         struct in6_addr laddr;  /* local tunnel end-point address */
         struct in6_addr raddr;  /* remote tunnel end-point address */