From: Rebecca Schultz Zavin <rebecca@android.com>
Date: Thu, 4 Nov 2010 00:05:58 +0000 (-0700)
Subject: Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~127
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c15c6cfcbe1a9e77dc57b73917384f544bb03ae6;p=firefly-linux-kernel-4.4.55.git

Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
---

c15c6cfcbe1a9e77dc57b73917384f544bb03ae6