Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (28 commits)
  staging: usbip: bugfix for isochronous packets and optimization
  staging: usbip: bugfix add number of packets for isochronous frames
  staging: usbip: bugfixes related to kthread conversion
  staging: usbip: fix shutdown problems.
  staging: hv: Fix GARP not sent after Quick Migration
  staging: IIO: IMU: ADIS16400: Avoid using printk facility directly
  staging: IIO: IMU: ADIS16400: Fix product ID check, skip embedded revision number
  staging: IIO: IMU: ADIS16400: Make sure only enabled scan_elements are pushed into the ring
  staging: IIO: IMU: ADIS16400: Fix addresses of GYRO and ACCEL calibration offset
  staging: IIO: IMU: ADIS16400: Add delay after self test
  staging: IIO: IMU: ADIS16400: Fix up SPI messages cs_change behavior
  staging/rtl81*: build as loadable modules only
  staging: brcm80211: removed 'is_amsdu causing toss' log spam
  staging: brcm80211: fix for 'Short CCK' log spam
  staging: brcm80211: fix for 'AC_BE txop..' logs spammed problem
  staging: memrar: remove driver from tree
  staging: sep: remove last memrar remnants
  staging: fix hv_mouse build, needs delay.h
  staging: fix olpc_dcon build errors
  staging: sm7xx: fixed defines
  ...

Fix up trivial conflict in drivers/staging/memrar/memrar_handler.c
(deleted vs trivial spelling fixes)

40 files changed, 324 insertions, 2092 deletions

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 18b43fcb417..dca4a0bb6ca 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -117,8 +117,6 @@ source "drivers/staging/hv/Kconfig"
 
 source "drivers/staging/vme/Kconfig"
 
-source "drivers/staging/memrar/Kconfig"
-
 source "drivers/staging/sep/Kconfig"
 
 source "drivers/staging/iio/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index cfd13cd55ef..eb93012b6f5 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -40,7 +40,6 @@ obj-$(CONFIG_VT6655)		+= vt6655/
 obj-$(CONFIG_VT6656)            += vt6656/
 obj-$(CONFIG_HYPERV)            += hv/
 obj-$(CONFIG_VME_BUS)           += vme/
-obj-$(CONFIG_MRST_RAR_HANDLER)  += memrar/
 obj-$(CONFIG_DX_SEP)            += sep/
 obj-$(CONFIG_IIO)               += iio/
 obj-$(CONFIG_CS5535_GPIO)       += cs5535_gpio/
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
index 717fced4580..ab7ab850e19 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
@@ -6283,7 +6283,7 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
                ((preamble_type[1] == WLC_MM_PREAMBLE) ==
                 (txh->MModeFbrLen != 0)));
 
-        ac = wme_fifo2ac[queue];
+        ac = skb_get_queue_mapping(p);
         if (SCB_WME(scb) && qos && wlc->edcf_txop[ac]) {
                 uint frag_dur, dur, dur_fallback;
 
@@ -6919,8 +6919,7 @@ prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p,
                 preamble = 0;
                 if (IS_CCK(rspec)) {
                         if (rxh->PhyRxStatus_0 & PRXS0_SHORTH)
-                                WL_ERROR("Short CCK\n");
-                        rx_status->flag |= RX_FLAG_SHORTPRE;
+                                rx_status->flag |= RX_FLAG_SHORTPRE;
                 } else if (IS_OFDM(rspec)) {
                         rx_status->flag |= RX_FLAG_SHORTPRE;
                 } else {
@@ -7079,10 +7078,8 @@ void BCMFASTPATH wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
         if (ieee80211_is_probe_req(h->frame_control))
                 goto toss;
 
-        if (is_amsdu) {
-                WL_ERROR("%s: is_amsdu causing toss\n", __func__);
+        if (is_amsdu)
                 goto toss;
-        }
 
         wlc_recvctl(wlc, rxh, p);
         return;
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
index b0729fc3c89..fb375ea26dd 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
@@ -95,47 +95,47 @@ void put_request_value(struct net_device *dev, long lvalue);
 USHORT hdr_checksum(PPSEUDO_HDR pHdr);
 
 typedef struct _DSP_FILE_HDR {
-        long build_date;
-        long dsp_coff_date;
-        long loader_code_address;
-        long loader_code_size;
-        long loader_code_end;
-        long dsp_code_address;
-        long dsp_code_size;
-        long dsp_code_end;
-        long reserved[8];
+        u32  build_date;
+        u32  dsp_coff_date;
+        u32  loader_code_address;
+        u32  loader_code_size;
+        u32  loader_code_end;
+        u32  dsp_code_address;
+        u32  dsp_code_size;
+        u32  dsp_code_end;
+        u32  reserved[8];
 } __attribute__ ((packed)) DSP_FILE_HDR, *PDSP_FILE_HDR;
 
 typedef struct _DSP_FILE_HDR_5 {
-        long version_id;        // Version ID of this image format.
-        long package_id;        // Package ID of code release.
-        long build_date;        // Date/time stamp when file was built.
-        long commands_offset;   // Offset to attached commands in Pseudo Hdr format.
-        long loader_offset;     // Offset to bootloader code.
-        long loader_code_address;       // Start address of bootloader.
-        long loader_code_end;   // Where bootloader code ends.
-        long loader_code_size;
-        long version_data_offset;       // Offset were scrambled version data begins.
-        long version_data_size; // Size, in words, of scrambled version data.
-        long nDspImages;        // Number of DSP images in file.
+        u32  version_id;        // Version ID of this image format.
+        u32  package_id;        // Package ID of code release.
+        u32  build_date;        // Date/time stamp when file was built.
+        u32  commands_offset;   // Offset to attached commands in Pseudo Hdr format.
+        u32  loader_offset;     // Offset to bootloader code.
+        u32  loader_code_address;       // Start address of bootloader.
+        u32  loader_code_end;   // Where bootloader code ends.
+        u32  loader_code_size;
+        u32  version_data_offset;       // Offset were scrambled version data begins.
+        u32  version_data_size; // Size, in words, of scrambled version data.
+        u32  nDspImages;        // Number of DSP images in file.
 } __attribute__ ((packed)) DSP_FILE_HDR_5, *PDSP_FILE_HDR_5;
 
 typedef struct _DSP_IMAGE_INFO {
-        long coff_date;         // Date/time when DSP Coff image was built.
-        long begin_offset;      // Offset in file where image begins.
+        u32  coff_date;         // Date/time when DSP Coff image was built.
+        u32  begin_offset;      // Offset in file where image begins.