From: Erik Gilling <konkers@android.com>
Date: Tue, 14 Dec 2010 05:12:12 +0000 (-0800)
Subject: Merge remote branch android-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~87
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=98bf149e45c7a6e93d2c09ff789f1e7c970ec9a7;p=firefly-linux-kernel-4.4.55.git

Merge remote branch android-2.6.36 into android-tegra-2.6.36

Change-Id: Ifd4c8ddc62f0c6e213d203498891d151d9b06442
---

98bf149e45c7a6e93d2c09ff789f1e7c970ec9a7