Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 6 Dec 2011 15:47:12 +0000 (10:47 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 6 Dec 2011 15:47:12 +0000 (10:47 -0500)
commitd39aeaf260e7d1ec6a677beed230a0406d0069a6
tree1f5881fc037eaf55e83d56b09cfb194274419ce4
parent40e4783ee62ac656a9a0fa3b512b6aee4f07d2d1
parentd7a4858c0fde8383f7aa494eda0fba6bef3f2fec
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem