From: Dima Zavin <dima@android.com>
Date: Thu, 11 Nov 2010 23:35:21 +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~350
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=760288c357c8cf1fc85f2e0d42f0ed117fb5d6fd;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	arch/arm/common/fiq_debugger.c

Change-Id: If8de163f3e1e41b35f87a5c8e9370f1cc28ed358
---

760288c357c8cf1fc85f2e0d42f0ed117fb5d6fd