]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 27 Dec 2007 06:04:46 +0000 (22:04 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 27 Dec 2007 06:04:46 +0000 (22:04 -0800)
commitd02103cf2c66f249c327c2042c14b1e938329d80
tree081c24059c57d8b6b4e6b6781f741878069e5edc
parente72e73c3db871e85b61b8e5f9f4bceee539545ac
parent073242b50ac6bfa0a8cd6d4a666a1f80a2783fab
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  [IPV4]: Fix ip command line processing.
  [VETH]: move veth.h to include/linux
  [NET] tc_nat: header install
  [TUNTAP]: Fix wrong debug message.
  [NETFILTER]: nf_conntrack_ipv4: fix module parameter compatibility
  mac80211: warn when receiving frames with unaligned data
  mac80211: round station cleanup timer