Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 11 Nov 2010 06:15:31 +0000 (22:15 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Nov 2010 06:15:31 +0000 (22:15 -0800)
commit8877870f8a8127b653f8c9a55c6b4de9f96f639b
treecc2629911f6b011ee2e3f4a85febbb9b6cc63604
parent7a1abd08d52fdeddb3e9a5a33f2f15cc6a5674d2
parent7379efeacb707f49729080791a7a562d8996aec4
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6