From: David S. Miller <davem@davemloft.net>
Date: Tue, 19 Jan 2010 19:43:42 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: firefly_0821_release~9833^2~3055^2~556
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6373464288cab09bc641be301d8d30fc9f64ba71;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
---

6373464288cab09bc641be301d8d30fc9f64ba71