Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 19 Oct 2012 17:55:42 +0000 (13:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 19 Oct 2012 17:55:42 +0000 (13:55 -0400)
commit06f40a41b80e25e88a2b612ea3b2a94f93c94f72
treefa3bc4d691d7024425183bfc1be75a36c4e1d3f3
parentdb0fe0b2f6bba2fda939737d063db2ae14c58d71
parent290eddc4b3661dc4dfa95d199e0be5788928b3b1
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem