Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 23 Aug 2013 15:47:48 +0000 (11:47 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 23 Aug 2013 15:47:48 +0000 (11:47 -0400)
commit81ca2ff9450c2e983ee416eca17ebe6fa9c3da4f
tree6e21a27d727481434b58543d8cff960bb7672b53
parent4a5a8aa6c966eafc106543bd955ae388230420e5
parent19c361608ce3e73f352e323262f7e0a8264be3af
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem