From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 1 Dec 2012 04:07:55 +0000 (+0800)
Subject: Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
X-Git-Tag: firefly_0821_release~8155
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ef62b5225e727baf228e18e0ee70fd1d9020f00c;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Conflicts:
	Makefile
	drivers/net/wireless/ath/ath9k/xmit.c
	drivers/net/wireless/rt2x00/rt2800lib.c
	scripts/Kbuild.include
---

ef62b5225e727baf228e18e0ee70fd1d9020f00c
diff --cc drivers/usb/serial/option.c
index a7ce5dab2c8c,a5f875d0d7ee..6d963e96f7a1
mode 100755,100644..100755
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
diff --cc drivers/usb/serial/usb-serial.c
index fe1f35634637,637dfa4efb5b..c20bd51bf461
mode 100755,100644..100755
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
diff --cc scripts/Kbuild.include
index 2c18eddc0eb1,6a437570cb69..1e75b5deed2a
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@@ -100,7 -100,7 +100,7 @@@ as-option = $(call try-run,
  # Usage: cflags-y += $(call as-instr,instr,option1,option2)
  
  as-instr = $(call try-run,\
- 	printf "%b\n" "$(1)" | $(CC) $(KBUILD_AFLAGS) -c -xassembler -o "$$TMP" -,$(2),$(3))
 -	/bin/echo -e "$(1)" | $(CC) $(KBUILD_AFLAGS) -c -x assembler -o "$$TMP" -,$(2),$(3))
++	printf "%b\n" "$(1)" | $(CC) $(KBUILD_AFLAGS) -c -x assembler -o "$$TMP" -,$(2),$(3))
  
  # cc-option
  # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)
diff --cc sound/core/pcm_native.c
index 58a86fcf4e19,7393551a8c47..903755aeb0b3
mode 100755,100644..100755
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c