Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Nov 2012 18:33:43 +0000 (13:33 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Nov 2012 18:33:43 +0000 (13:33 -0500)
commit5bdf502dd9c8fd60dddaabfb9a3dc1671302afd2
tree1547396386999c30cb6bd6768d1ba6dc1926ff2a
parentbf0098f22ca7b59e8844ac6882bbae230d34b98d
parent38141fcfaad34a388e61a7a7e98d521330e049d6
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
MAINTAINERS
drivers/net/wireless/rt2x00/rt2800lib.c