summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-24 15:57:12 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-24 15:57:12 -0700
commit03746bad30890284cc14fc39184c5b60b9cb8bc9 (patch)
tree598728021adf309e2e46130bdef86ecf1b601054 /drivers/pci
parent719be62903a6e6419789557cb3ed0e840d3e4ca9 (diff)
parent3f5f4346b6d3c8bc33780a941da2473c4be2c989 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [8021Q]: vlan_ioctl_handler: fix return value [GENETLINK]: Correctly report errors while registering a multicast group [GENETLINK]: Fix adjustment of number of multicast groups [GENETLINK]: Fix race in genl_unregister_mc_groups() [NETFILTER]: Clean up duplicate includes in net/netfilter/ [NETFILTER]: Clean up duplicate includes in net/bridge/ [NETFILTER]: Fix logging regression [TCPv6] MD5SIG: Ensure to reset allocation count to avoid panic.
Diffstat (limited to 'drivers/pci')
0 files changed, 0 insertions, 0 deletions