From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 4 Nov 2013 19:45:14 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.13-rc1~105^2~55^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01925efdf7e03b4b803b5c9f985163d687f7f017;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/drv.c
---

01925efdf7e03b4b803b5c9f985163d687f7f017
Reading git-diff-tree failed