]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b50fd73 a6c05c3)
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)
commitc68cb23dde29fb107575656effa46f7b9440ac04
tree081c24059c57d8b6b4e6b6781f741878069e5edctree | snapshot
parentb50fd73b9d8ee1f999e8d625074872eb8fb88439commit | diff
parenta6c05c3d064dbb83be88cba3189beb5db9d2dfc3commit | diff
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
Linux 2.6 source tree