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

diff --cc drivers/net/usb/usbnet.c
Simple merge

diff --cc drivers/usb/serial/option.c
index a7ce5dab2c8c4301efd02b717b4a7a8c9249aedd,a5f875d0d7ee8a8b777f26257974e62c134e9c6a..6d963e96f7a1a674d24b77527af3e8ab0be93fef
mode 100755,100644..100755
--- 1/drivers/usb/serial/option.c
--- 2/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c

diff --cc drivers/usb/serial/usb-serial.c
index fe1f35634637a5ecffcf5d2d294975f3ef0c048e,637dfa4efb5bc9531a0b79093cd3b1d14d8ecc11..c20bd51bf461aa2caa00d399e98740161c0e7be8
mode 100755,100644..100755
--- 1/drivers/usb/serial/usb-serial.c
--- 2/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c

diff --cc kernel/futex.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge

diff --cc scripts/Kbuild.include
index 2c18eddc0eb1cabc27acea81f7a8a4bd1989c463,6a437570cb6996161f1ee2a0f59c3ba5d50a9cbc..1e75b5deed2a912a3a6e2d7b41ad5843b4580f1a
--- 1/scripts/Kbuild.include
--- 2/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 58a86fcf4e196277d93fb4e3e74461f0c9e36f90,7393551a8c47e1cf3aec2b4fcf44752f4066d3da..903755aeb0b3a48a2e6f102d7effe5b07870c3f5
mode 100755,100644..100755
--- 1/sound/core/pcm_native.c
--- 2/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c