Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 29 Jul 2010 18:47:07 +0000 (14:47 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 29 Jul 2010 18:47:07 +0000 (14:47 -0400)
commitae3568adf42d5d3bb3cfa505b94351c5d1ce4924
tree112865a6e6b1e4ddf70362f3efb295c495ec85b9
parent7f3e01fee41a322747db2d7574516d9fbd3785c0
parentb7753c8cd51dce67a0b152efb456a21ff1cc241b
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem
MAINTAINERS
include/net/mac80211.h
net/mac80211/cfg.c