From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 19 Jun 2013 18:50:44 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: next-20130628~72^2~22^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2f2a8846d51ed7342603a8d7c196fcc9e2f8a319;p=karo-tx-linux.git

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

2f2a8846d51ed7342603a8d7c196fcc9e2f8a319