From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 14 Feb 2013 19:23:33 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b90af3b8c69730fb25646c04866dfccec2f1314b;p=deliverable%2Flinux.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/dvm/tx.c
---

b90af3b8c69730fb25646c04866dfccec2f1314b