From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 May 2011 19:49:28 +0000 (-0700)
Subject: Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v3.0-rc1~336
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f3a8e093f470ef193b0ca6011d90180331c8b53;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'staging-next' of git://git./linux/kernel/git/gregkh/staging-2.6

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (970 commits)
  staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_
  staging:iio: Trivial kconfig reorganization and uniformity improvements.
  staging:iio:documenation partial update.
  staging:iio: use pollfunc allocation helpers in remaining drivers.
  staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out.
  staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev.
  staging:iio:meter:ade7758: Use private data space from iio_allocate_device
  staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value.
  staging:iio: ring core cleanups + check if read_last available in lis3l02dq
  staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name.
  staging:iio: poll func allocation clean up.
  staging:iio:ad7780 trivial unused header cleanup.
  staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes
  staging:iio:adc:AD7780: Convert to new channel registration method
  staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv()
  staging:iio:adc: AD7606: Consitently use indio_dev
  staging:iio: Rip out helper for software rings.
  staging:iio:adc:AD7298: Use private data space from iio_allocate_device
  staging:iio: rationalization of different buffer implementation hooks.
  staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev.
  ...

Fix up trivial conflicts in
 - drivers/staging/intel_sst/intelmid.c: patches applied in both branches
 - drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling
 - drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion
---

1f3a8e093f470ef193b0ca6011d90180331c8b53
diff --cc drivers/staging/intel_sst/intelmid_v2_control.c
index 3c6b3ab,401a180..000378a
--- a/drivers/staging/intel_sst/intelmid_v2_control.c
+++ b/drivers/staging/intel_sst/intelmid_v2_control.c
@@@ -28,11 -28,13 +28,14 @@@
  
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
+ #include <linux/gpio.h>
  #include <linux/pci.h>
 +#include <linux/delay.h>
  #include <linux/file.h>
+ #include <sound/control.h>
  #include "intel_sst.h"
  #include "intelmid_snd_control.h"
+ #include "intelmid.h"
  
  enum reg_v3 {
  	VAUDIOCNT = 0x51,
diff --cc drivers/staging/usbip/vhci_hcd.c
index 4f4f133,598f311..a76e8fa
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
@@@ -876,12 -846,10 +846,12 @@@ static void vhci_shutdown_connection(st
  	}
  
  	/* kill threads related to this sdev, if v.c. exists */
 -	kthread_stop(vdev->ud.tcp_rx);
 -	kthread_stop(vdev->ud.tcp_tx);
 +	if (vdev->ud.tcp_rx)
 +		kthread_stop(vdev->ud.tcp_rx);
 +	if (vdev->ud.tcp_tx)
 +		kthread_stop(vdev->ud.tcp_tx);
  
- 	usbip_uinfo("stop threads\n");
+ 	pr_info("stop threads\n");
  
  	/* active connection is closed */
  	if (vdev->ud.tcp_socket != NULL) {
@@@ -1135,10 -1085,10 +1084,10 @@@ static int vhci_hcd_probe(struct platfo
  	 */
  	hcd = usb_create_hcd(&vhci_hc_driver, &pdev->dev, dev_name(&pdev->dev));
  	if (!hcd) {
- 		usbip_uerr("create hcd failed\n");
+ 		pr_err("create hcd failed\n");
  		return -ENOMEM;
  	}
 -
 +	hcd->has_tt = 1;
  
  	/* this is private data for vhci_hcd */
  	the_controller = hcd_to_vhci(hcd);