Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 9 Oct 2009 21:40:09 +0000 (14:40 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 Oct 2009 21:40:09 +0000 (14:40 -0700)
commit8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc
treee5e6cc8637a44354997624f26d4d55834c9915b4
parentcd7e1f0b056c071860db65c847a854b3093d6606
parenteab2ec83dbf0e32e28f3108f302ffdaa225d4cce
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6
net/core/net-sysfs.c
net/socket.c