Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Dec 2011 18:54:26 +0000 (13:54 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Dec 2011 18:54:26 +0000 (13:54 -0500)
commit9f6e20cee6253c4ca5faacba8dbd09ebe70132ed
tree0dbcdabca91864daaf174bb014a5f46316880403
parentd1d182e00d72300e05b18e28372fab003d8d4a58
parent5bd5e9a6ae5137a61d0b5c277eac61892d89fc4f
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem