From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 10 Jan 2014 15:59:40 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: firefly_0821_release~176^2~4570^2~238^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=235f93922878234f3d99a4205ebe3634ee955919;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	net/ieee802154/6lowpan.c
---

235f93922878234f3d99a4205ebe3634ee955919