diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 19:16:24 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 19:16:24 +0400 |
| commit | 4598c95514f9a50b49626e1e5d1f292180b643fa (patch) | |
| tree | 8f6bee748bf326f61b07b2bcbd931f894fd2713b /include/linux/pci_ids.h | |
| parent | 641e22e04c48af5d813f119c55336e02a22756f5 (diff) | |
| parent | 575c3e2a041c08ad39b5d4535539a9a7d4c63aa6 (diff) | |
| download | linux-4598c95514f9a50b49626e1e5d1f292180b643fa.tar.xz | |
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:
[RTNETLINK]: Remove remains of wireless extensions over rtnetlink
[RTNETLINK]: Allow changing of subsets of netdevice flags in rtnl_setlink
[AF_RXRPC]: Make call state names available if CONFIG_PROC_FS=n
[AF_RXRPC]: AF_RXRPC depends on IPv4
[IPSEC]: Fix warnings with casting int to pointer
Diffstat (limited to 'include/linux/pci_ids.h')
0 files changed, 0 insertions, 0 deletions