Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 8 Oct 2009 22:55:21 +0000 (15:55 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 8 Oct 2009 22:55:21 +0000 (15:55 -0700)
commit67972e0c238fa802580b5919f11e1de3da5179da
tree27022c957154a9d36fc8aa0f020bed523e7849b3
parentad61df918c44316940404891d5082c63e79c256a
parent8a8e05e5d8f6155788761961fc9845328863c16d
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6