Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/hid.h

1 files changed, 1 insertions, 1 deletions

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index c14b70ed4c57..4e927ebd1cb3 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -20,7 +20,7 @@ struct route_info {
                                 route_pref:2,
                                 reserved_h:3;
 #endif
-        __u32                   lifetime;
+        __be32                  lifetime;
         __u8                    prefix[0];      /* 0,8 or 16 */
 };