From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 29 Oct 2012 20:05:51 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~45^2~17^2^2~100^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab3d59d265e772e734c36fe738809cb1a910f566;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/mwifiex/cfg80211.c
---

ab3d59d265e772e734c36fe738809cb1a910f566
Reading git-diff-tree failed