Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 8 Oct 2010 17:36:51 +0000 (10:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 Oct 2010 17:36:51 +0000 (10:36 -0700)
commit94b105723a3bfca45c75916423cd959ce71ed215
tree3138e19c9511738436dc75f773acde596f5973a2
parentb530fb69cf54cf22768a3eabc0604d70b5c13fde
parent4efe7f51be508a13965f163006dcb32b38a914a3
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6