From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 2 Jun 2014 15:20:17 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~36^2~99^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcb2c0d6cf75750e2912b09a3d0a782c90e2b1a0;p=pandora-kernel.git

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

fcb2c0d6cf75750e2912b09a3d0a782c90e2b1a0