]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 31 Jan 2011 21:13:24 +0000 (13:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 31 Jan 2011 21:13:24 +0000 (13:13 -0800)
commitfd11fc18ef8e4ed0ecfbbabcd185a9a6890384e8
tree4f1ca17feda4dfa88f53eceeaa39583ec840d27e
parentd569cf8db33f9885453a1892776a5ff62c566f86
parentfd303b5acd6e6ef09220c36c48bf07efcfd8860a
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
drivers/net/bnx2x/bnx2x.h
drivers/net/bnx2x/bnx2x_main.c
include/net/sock.h
net/core/dev.c
net/core/rtnetlink.c
net/ipv4/af_inet.c