- merge revision 1.7
authorMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:39:19 +0000 (20:39 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:39:19 +0000 (20:39 +0000)
commit5584d6eae236f4100d7d87f02193b7fe36800303
tree83b808157534d0849d320fdfe36b9ffdbe670e73
parent8e4dbe0ebc0e18a706b8bd57729f8d622a46ed7a
- merge revision 1.7
date: 2005/01/10 19:31:58;  author: mlhuang;  state: Exp;  lines: +14 -0
- backport 2.6.9 addition of skb_header_pointer() macro to support
  pptp-conntrack-nat patch
include/linux/skbuff.h