From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 24 Aug 2011 02:32:50 +0000 (+0800)
Subject: Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36
X-Git-Tag: firefly_0821_release~9770
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=541e448096530e327668a7645b437373b31842ad;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

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

541e448096530e327668a7645b437373b31842ad