From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 27 Aug 2012 15:04:24 +0000 (-0700)
Subject: Merge branch 'master' into upstream
X-Git-Tag: firefly_0821_release~3680^2~2006^2~1^2~15
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' into upstream

Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.
---

66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e