From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 28 Jun 2011 01:47:32 +0000 (+0800)
Subject: Merge remote-tracking branch 'linux-2.6.32.y/master' into develop
X-Git-Tag: firefly_0821_release~10164^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2caa51d22aaf6dd05475ebb7b67bf0de29cbb9af;p=firefly-linux-kernel-4.4.55.git

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

Merge Linux 2.6.32.42
Conflicts:
	Makefile
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/p54/p54usb.c
---

2caa51d22aaf6dd05475ebb7b67bf0de29cbb9af
diff --cc drivers/usb/core/hub.c
index 00d4085f1d25,03eed28de77c..a51e1ffe65ce
mode 100755,100644..100755
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
diff --cc fs/block_dev.c
index 8ff421c19357,16cea865268e..267c5005e948
mode 100755,100644..100755
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
diff --cc sound/soc/codecs/wm_hubs.c
index b409e60cbe48,12506dc4feb5..e1924d5dc3fd
mode 100755,100644..100755
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c