From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 24 Aug 2006 04:41:25 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... 
X-Git-Tag: firefly_0821_release~33854^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=357eb4cf75fdb9dbe46b64d50f3670de6a45dc91;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes
---

357eb4cf75fdb9dbe46b64d50f3670de6a45dc91