Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 29 May 2013 14:59:35 +0000 (10:59 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 29 May 2013 14:59:35 +0000 (10:59 -0400)
commit50cc1cab4cfc8ab32dc6ae470c271cdf65e82de3
tree50a1488b5bf44499fe8d2ad73543bf7f8fc4b05b
parent8e6d91ae0917bf934ed86411148f79d904728d51
parentadd295a4afbdf5852d004c754c552d692b0fcac8
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem