]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 641e22e 575c3e2)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 23 May 2007 15:16:24 +0000 (08:16 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 23 May 2007 15:16:24 +0000 (08:16 -0700)
commit4598c95514f9a50b49626e1e5d1f292180b643fa
tree8f6bee748bf326f61b07b2bcbd931f894fd2713btree | snapshot
parent641e22e04c48af5d813f119c55336e02a22756f5commit | diff
parent575c3e2a041c08ad39b5d4535539a9a7d4c63aa6commit | 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:
  [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
Linux 2.6 source tree