From: 黄涛 <huangtao@rock-chips.com>
Date: Sun, 13 Feb 2011 02:25:30 +0000 (+0800)
Subject: Merge remote branch 'linux-2.6.32.y/master' into develop
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=84aa38e58d1115f2562cdbed32c57ed9a6e460e8;p=firefly-linux-kernel-4.4.55.git

Merge remote branch 'linux-2.6.32.y/master' into develop

Conflicts:
	drivers/net/wireless/orinoco/main.c
	drivers/net/wireless/orinoco/wext.c
	drivers/net/wireless/p54/p54usb.c
---

84aa38e58d1115f2562cdbed32c57ed9a6e460e8