From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 1 Feb 2011 17:01:27 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: 2.1b_release~5021^2~417^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa9a741b841d0c2db04875310a06e8718c56fd4f;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

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

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

fa9a741b841d0c2db04875310a06e8718c56fd4f