aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-23 08:16:24 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-23 08:16:24 -0700
commit4598c95514f9a50b49626e1e5d1f292180b643fa (patch)
tree8f6bee748bf326f61b07b2bcbd931f894fd2713b /arch/ia64
parent641e22e04c48af5d813f119c55336e02a22756f5 (diff)
parent575c3e2a041c08ad39b5d4535539a9a7d4c63aa6 (diff)
downloadlinux-2.6.34-ux500-4598c95514f9a50b49626e1e5d1f292180b643fa.tar.gz
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 'arch/ia64')
0 files changed, 0 insertions, 0 deletions