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, 6 insertions, 6 deletions

diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index c771a7db9871..68d3526c3a05 100644
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -7,17 +7,17 @@ struct icmp6hdr {
 
         __u8            icmp6_type;
         __u8            icmp6_code;
-        __u16           icmp6_cksum;
+        __sum16         icmp6_cksum;
 
 
         union {
-                __u32                   un_data32[1];
-                __u16                   un_data16[2];
+                __be32                  un_data32[1];
+                __be16                  un_data16[2];
                 __u8                    un_data8[4];
 
                 struct icmpv6_echo {
-                        __u16           identifier;
-                        __u16           sequence;
+                        __be16          identifier;
+                        __be16          sequence;
                 } u_echo;
 
                 struct icmpv6_nd_advt {
@@ -53,7 +53,7 @@ struct icmp6hdr {
 #else
 #error  "Please fix <asm/byteorder.h>"
 #endif
-                        __u16           rt_lifetime;
+                        __be16          rt_lifetime;
                 } u_nd_ra;
 
         } icmp6_dataun;