Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

author David S. Miller <davem@davemloft.net>

Fri, 9 Oct 2009 21:40:09 +0000 (14:40 -0700)

committer David S. Miller <davem@davemloft.net>

Fri, 9 Oct 2009 21:40:09 +0000 (14:40 -0700)
author David S. Miller <davem@davemloft.net>
Fri, 9 Oct 2009 21:40:09 +0000 (14:40 -0700)
committer David S. Miller <davem@davemloft.net>
Fri, 9 Oct 2009 21:40:09 +0000 (14:40 -0700)
diff --cc net/core/net-sysfs.c
Simple merge
diff --cc net/socket.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Fri, 9 Oct 2009 21:40:09 +0000 (14:40 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 9 Oct 2009 21:40:09 +0000 (14:40 -0700)
		1	2
net/core/net-sysfs.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/socket.c	patch \|	diff1 \|	diff2 \|	blob \| history