From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 5 Aug 2010 08:41:38 +0000 (+0800)
Subject: Merge remote branch 'common/android-2.6.32' into develop
X-Git-Tag: firefly_0821_release~11301
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c7e039e278f094a51d706b217cfdb92a7bfb37a6;p=firefly-linux-kernel-4.4.55.git

Merge remote branch 'common/android-2.6.32' into develop

Conflicts:
	drivers/usb/gadget/f_adb.c
---

c7e039e278f094a51d706b217cfdb92a7bfb37a6