From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 3 Jan 2014 20:25:15 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=55d1cad2efe2e3567c3116f50ba10e5af1bc01fc;p=linux-beck.git

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
---

55d1cad2efe2e3567c3116f50ba10e5af1bc01fc