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

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

b41914227e944b49368b07b043cda35cd21eefea