From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 27 Sep 2013 17:09:17 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.12-rc4~30^2~39^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a878747e18d4d14c5b772dcddddd86bb4c26f8f;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem

Also fixed-up a badly indented closing brace...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

0a878747e18d4d14c5b772dcddddd86bb4c26f8f
Reading git-diff-tree failed