From: Rebecca Schultz Zavin <rebecca@android.com>
Date: Mon, 2 May 2011 19:29:23 +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~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=734779ea0f1af6eb7ac747d8780a361afa956e4c;p=firefly-linux-kernel-4.4.55.git

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

734779ea0f1af6eb7ac747d8780a361afa956e4c