summaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-19 22:13:47 +0100
committerDavid S. Miller <davem@davemloft.net>2010-11-19 22:13:47 +0100
commit24912420e923d56461b400d83f250a31bed8a964 (patch)
tree3bb599e665ed7510df2e3f4c8cb008f7a33f50a9 /drivers/net/ixgbe
parentX25: remove bkl in routing ioctls (diff)
parentnet: fix kernel-doc for sk_filter_rcu_release (diff)
downloadlinux-24912420e923d56461b400d83f250a31bed8a964.tar.xz
linux-24912420e923d56461b400d83f250a31bed8a964.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/bonding/bond_main.c net/core/net-sysfs.c net/ipv6/addrconf.c
Diffstat (limited to 'drivers/net/ixgbe')
0 files changed, 0 insertions, 0 deletions