]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 31 Oct 2007 14:46:51 +0000 (07:46 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 31 Oct 2007 14:46:51 +0000 (07:46 -0700)
commitc569b3ef50aa4fec90c447b6fb5011ae2f0dfa2b
tree37598ca7162d5d440ab554a45d6f64347f4e5df4
parentbc1d137cca15a42c0c8c5bac17dc5825540d658b
parent78e5951e494fa5fb5d9fd26c9da3b90915bc4d8e
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  [AF_KEY]: suppress a warning for 64k pages.
  [TIPC]: Fix headercheck wrt. tipc_config.h
  [COMPAT]: Fix build on COMPAT platforms when CONFIG_NET is disabled.
  [CONNECTOR]: Fix a spurious kfree_skb() call
  [COMPAT]: Fix new dev_ifname32 returning -EFAULT
  [NET]: Fix incorrect sg_mark_end() calls.
  [IPVS]: Remove /proc/net/ip_vs_lblcr
  [IPV6]: remove duplicate call to proc_net_remove
  [NETNS]: fix net released by rcu callback
  [NET]: Fix free_netdev on register_netdev failure.
  [WAN]: fix drivers/net/wan/lmc/ compilation