From: Colin Cross <ccross@android.com>
Date: Wed, 13 Jul 2011 03:10:37 +0000 (-0700)
Subject: Merge commit 'v3.0-rc7' into android-3.0
X-Git-Tag: firefly_0821_release~7613^2~441
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=75c56a81116e51c5cf15c0641906d0745188cd16;p=firefly-linux-kernel-4.4.55.git

Merge commit 'v3.0-rc7' into android-3.0
---

75c56a81116e51c5cf15c0641906d0745188cd16