From: John W. Linville Date: Tue, 21 Aug 2012 20:00:21 +0000 (-0400) 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=01e17dacd47101ad7d33152bbfbbd4394352d2e6;p=linux-beck.git Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next Conflicts: drivers/net/wireless/mac80211_hwsim.c --- 01e17dacd47101ad7d33152bbfbbd4394352d2e6