From: Rebecca Schultz Zavin <rebecca@android.com>
Date: Mon, 14 Feb 2011 23:32:54 +0000 (-0800)
Subject: Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~117
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=62be8555d77c2361b4af0b57800005b506c927f6;p=firefly-linux-kernel-4.4.55.git

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

62be8555d77c2361b4af0b57800005b506c927f6