From: Colin Cross <ccross@android.com>
Date: Wed, 22 Dec 2010 02:38:13 +0000 (-0800)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~79
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3f29a8834975956ed5590959bfced00cb9bd03ed;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/usb/gadget/composite.c

Change-Id: I1a332ec21da62aea98912df9a01cf0282ed50ee1
---

3f29a8834975956ed5590959bfced00cb9bd03ed