From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 31 Jan 2011 20:24:31 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: firefly_0821_release~7613^2~2196^2~403^2~62^2~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=78d12c237ca2e32ac6570b161d2137b5288c5511;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/net/wireless/wl12xx/spi.c
---

78d12c237ca2e32ac6570b161d2137b5288c5511