Merge commit 'v2.6.36' into kbuild/misc

Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h
index 4021d47cc437..72bfa5a034dd 100644
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
@@ -46,6 +46,9 @@ struct sockaddr_ll {
 #define PACKET_RESERVE                  12
 #define PACKET_TX_RING                  13
 #define PACKET_LOSS                     14
+#define PACKET_VNET_HDR                 15
+#define PACKET_TX_TIMESTAMP             16
+#define PACKET_TIMESTAMP                17
 
 struct tpacket_stats {
         unsigned int    tp_packets;