]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2009 06:00:34 +0000 (22:00 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2009 06:00:34 +0000 (22:00 -0800)
1  2 
Documentation/networking/ip-sysctl.txt
drivers/net/atl1e/atl1e_main.c
drivers/net/bnx2.c

Simple merge
Simple merge