Staging: merge 2.6.39-rc3 into staging-next

This was done to handle a number of conflicts, the majority of which
were caused by the big "fix spelling issues" patch.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
Simple merge

diff --cc drivers/staging/ath6kl/include/common/dbglog.h
Simple merge

diff --cc drivers/staging/ath6kl/include/common/epping_test.h
Simple merge

diff --cc drivers/staging/ath6kl/include/common/wmi.h
Simple merge

diff --cc drivers/staging/ath6kl/include/common/wmix.h
Simple merge

diff --cc drivers/staging/ath6kl/os/linux/ar6000_drv.c
Simple merge

diff --cc drivers/staging/ath6kl/wmi/wmi.c
Simple merge

diff --cc drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
Simple merge

diff --cc drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
Simple merge

diff --cc drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
Simple merge

diff --cc drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
Simple merge

diff --cc drivers/staging/brcm80211/brcmsmac/wlc_main.c
Simple merge

diff --cc drivers/staging/brcm80211/util/bcmsrom.c
Simple merge

diff --cc drivers/staging/brcm80211/util/hnddma.c
Simple merge

diff --cc drivers/staging/brcm80211/util/siutils.c
Simple merge

diff --cc drivers/staging/gma500/psb_drv.c
Simple merge

diff --cc drivers/staging/gma500/psb_intel_sdvo.c
Simple merge

diff --cc drivers/staging/hv/blkvsc_drv.c
Simple merge

diff --cc drivers/staging/hv/channel.c
Simple merge

diff --cc drivers/staging/hv/channel_mgmt.c
Simple merge

diff --cc drivers/staging/hv/connection.c
Simple merge

diff --cc drivers/staging/hv/hv.c
Simple merge

diff --cc drivers/staging/hv/hv_mouse.c
Simple merge

diff --cc drivers/staging/hv/hv_util.c
index 3af0a11,2df1568..8038589
--- 1/drivers/staging/hv/hv_util.c
--- 2/drivers/staging/hv/hv_util.c
+++ b/drivers/staging/hv/hv_util.c
@@@ -78,8 -79,8 +78,8 @@@ static void shutdown_onchannelcallback(
                                icmsghdrp->status = HV_S_OK;
                                execute_shutdown = true;
  
 -                              DPRINT_INFO(VMBUS, "Shutdown request received -"
 -                                          " graceful shutdown initiated");
 +                              pr_info("Shutdown request received -"
-                                           " gracefull shutdown initiated\n");
++                                          " graceful shutdown initiated\n");
                                break;
                        default:
                                icmsghdrp->status = HV_E_FAIL;

diff --cc drivers/staging/hv/netvsc_drv.c
index 54a203b,3397356..258233d
--- 1/drivers/staging/hv/netvsc_drv.c
--- 2/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@@ -214,10 -220,11 +215,11 @@@ static void netvsc_linkstatus_callback(
                                       unsigned int status)
  {
        struct net_device *net = dev_get_drvdata(&device_obj->device);
+       struct net_device_context *ndev_ctx;
  
        if (!net) {
 -              DPRINT_ERR(NETVSC_DRV, "got link status but net device "
 -                              "not initialized yet");
 +              netdev_err(net, "got link status but net device "
 +                              "not initialized yet\n");
                return;
        }
  

diff --cc drivers/staging/hv/rndis_filter.c
index 1678705,048376b..6305050
--- 1/drivers/staging/hv/rndis_filter.c
--- 2/drivers/staging/hv/rndis_filter.c
+++ b/drivers/staging/hv/rndis_filter.c
@@@ -578,10 -583,9 +578,10 @@@ static int rndis_filter_set_packet_filt
                msecs_to_jiffies(2000));
        if (request->wait_condition == 0) {
                ret = -1;
 -              DPRINT_ERR(NETVSC, "timeout before we got a set response...");
 +              dev_err(&dev->net_dev->dev->device,
 +                      "timeout before we got a set response...\n");
                /*
-                * We cant deallocate the request since we may still receive a
+                * We can't deallocate the request since we may still receive a
                 * send completion for it.
                 */
                goto Exit;

diff --cc drivers/staging/hv/vmbus_drv.c
index 501ab36,79089f8..c944450
--- 1/drivers/staging/hv/vmbus_drv.c
--- 2/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@@ -527,8 -254,10 +527,8 @@@ static int vmbus_on_isr(void
        event = (union hv_synic_event_flags *)page_addr + VMBUS_MESSAGE_SINT;
  
        /* Since we are a child, we only need to check bit 0 */
-       if (test_and_clear_bit(0, (unsigned long *) &event->flags32[0]))
 -      if (sync_test_and_clear_bit(0, (unsigned long *) &event->flags32[0])) {
 -              DPRINT_DBG(VMBUS, "received event %d", event->flags32[0]);
++      if (sync_test_and_clear_bit(0, (unsigned long *) &event->flags32[0]))
                ret |= 0x2;
 -      }
  
        return ret;
  }