From: Rebecca Schultz Zavin <rebecca@android.com>
Date: Tue, 19 Oct 2010 19:50:25 +0000 (-0700)
Subject: Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~439
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=46b4580f161e414b0b5c393fbd2a34b37cfc12d8;p=firefly-linux-kernel-4.4.55.git

Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
---

46b4580f161e414b0b5c393fbd2a34b37cfc12d8