Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 30 Sep 2010 19:02:22 +0000 (12:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Sep 2010 19:02:22 +0000 (12:02 -0700)
commit92629195314d8adefabeb78b13d681ad1c01e778
treecc84705305a643b391965e4136d07509234ff0e5
parenta91e7d471e2e384035b9746ea707ccdcd353f5dd
parente7ee762cf074b0fd8eec483d0cef8fdbf0d04b81
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6