Merge git://git.infradead.org/users/dwmw2/spectra-2.6 into work

diff --combined drivers/staging/Kconfig
index 984a75440710673efe2c50ea5967c460a7ef3d12,79cf5f720952aaae2772c8baf5822b3a4856a6a6..2faff96974674c938a0bbb6b59701b619cee4cec
--- 1/drivers/staging/Kconfig
--- 2/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -49,8 -49,6 +49,8 @@@ source "drivers/staging/go7007/Kconfig
  
  source "drivers/staging/cx25821/Kconfig"
  
 +source "drivers/staging/tm6000/Kconfig"
 +
  source "drivers/staging/usbip/Kconfig"
  
  source "drivers/staging/winbond/Kconfig"
@@@ -59,6 -57,8 +59,6 @@@ source "drivers/staging/wlan-ng/Kconfig
  
  source "drivers/staging/echo/Kconfig"
  
 -source "drivers/staging/poch/Kconfig"
 -
  source "drivers/staging/otus/Kconfig"
  
  source "drivers/staging/rt2860/Kconfig"
@@@ -97,6 -97,8 +97,8 @@@ source "drivers/staging/octeon/Kconfig
  
  source "drivers/staging/serqt_usb2/Kconfig"
  
+ source "drivers/staging/spectra/Kconfig"
+ 
  source "drivers/staging/quatech_usb2/Kconfig"
  
  source "drivers/staging/vt6655/Kconfig"
@@@ -111,8 -113,6 +113,8 @@@ source "drivers/staging/vme/Kconfig
  
  source "drivers/staging/rar_register/Kconfig"
  
 +source "drivers/staging/memrar/Kconfig"
 +
  source "drivers/staging/sep/Kconfig"
  
  source "drivers/staging/iio/Kconfig"
@@@ -127,25 -127,19 +129,25 @@@ source "drivers/staging/batman-adv/Kcon
  
  source "drivers/staging/samsung-laptop/Kconfig"
  
 -source "drivers/staging/strip/Kconfig"
 +source "drivers/staging/sm7xx/Kconfig"
 +
 +source "drivers/staging/dt3155/Kconfig"
 +
 +source "drivers/staging/dt3155v4l/Kconfig"
  
 -source "drivers/staging/arlan/Kconfig"
 +source "drivers/staging/crystalhd/Kconfig"
  
 -source "drivers/staging/wavelan/Kconfig"
 +source "drivers/staging/cxt1e1/Kconfig"
  
 -source "drivers/staging/netwave/Kconfig"
 +source "drivers/staging/ti-st/Kconfig"
  
 -source "drivers/staging/sm7xx/Kconfig"
 +source "drivers/staging/adis16255/Kconfig"
  
 -source "drivers/staging/dt3155/Kconfig"
 +source "drivers/staging/xgifb/Kconfig"
  
 -source "drivers/staging/crystalhd/Kconfig"
 +source "drivers/staging/mrst-touchscreen/Kconfig"
 +
 +source "drivers/staging/msm/Kconfig"
  
  endif # !STAGING_EXCLUDE_BUILD
  endif # STAGING

diff --combined drivers/staging/Makefile
index 9fa25133874afc9b0c2a4c4b31a87f0aa98468d3,2e2f96ee2c80ade5e781a9acaeaea003451c4bdf..6d21710d3311fd9113e96a655426afbd3a03e2a9
--- 1/drivers/staging/Makefile
--- 2/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -7,11 -7,11 +7,11 @@@ obj-$(CONFIG_ET131X)          += et131x
  obj-$(CONFIG_SLICOSS)         += slicoss/
  obj-$(CONFIG_VIDEO_GO7007)    += go7007/
  obj-$(CONFIG_VIDEO_CX25821)   += cx25821/
 +obj-$(CONFIG_VIDEO_TM6000)    += tm6000/
  obj-$(CONFIG_USB_IP_COMMON)   += usbip/
  obj-$(CONFIG_W35UND)          += winbond/
  obj-$(CONFIG_PRISM2_USB)      += wlan-ng/
  obj-$(CONFIG_ECHO)            += echo/
 -obj-$(CONFIG_POCH)            += poch/
  obj-$(CONFIG_OTUS)            += otus/
  obj-$(CONFIG_RT2860)          += rt2860/
  obj-$(CONFIG_RT2870)          += rt2870/
@@@ -22,6 -22,7 +22,7 @@@ obj-$(CONFIG_R8187SE)         += rtl8187se
  obj-$(CONFIG_RTL8192SU)               += rtl8192su/
  obj-$(CONFIG_RTL8192U)                += rtl8192u/
  obj-$(CONFIG_RTL8192E)                += rtl8192e/
+ obj-$(CONFIG_SPECTRA)         += spectra/
  obj-$(CONFIG_TRANZPORT)               += frontier/
  obj-$(CONFIG_DREAM)           += dream/
  obj-$(CONFIG_POHMELFS)                += pohmelfs/
@@@ -36,7 -37,6 +37,7 @@@ obj-$(CONFIG_FB_UDL)          += udlfb
  obj-$(CONFIG_HYPERV)          += hv/
  obj-$(CONFIG_VME_BUS)         += vme/
  obj-$(CONFIG_RAR_REGISTER)    += rar_register/
 +obj-$(CONFIG_MRST_RAR_HANDLER)        += memrar/
  obj-$(CONFIG_DX_SEP)          += sep/
  obj-$(CONFIG_IIO)             += iio/
  obj-$(CONFIG_RAMZSWAP)                += ramzswap/
@@@ -44,13 -44,11 +45,13 @@@ obj-$(CONFIG_WLAGS49_H2)   += wlags49_h2
  obj-$(CONFIG_WLAGS49_H25)     += wlags49_h25/
  obj-$(CONFIG_BATMAN_ADV)      += batman-adv/
  obj-$(CONFIG_SAMSUNG_LAPTOP)  += samsung-laptop/
 -obj-$(CONFIG_STRIP)           += strip/
 -obj-$(CONFIG_ARLAN)           += arlan/
 -obj-$(CONFIG_WAVELAN)         += wavelan/
 -obj-$(CONFIG_PCMCIA_WAVELAN)  += wavelan/
 -obj-$(CONFIG_PCMCIA_NETWAVE)  += netwave/
  obj-$(CONFIG_FB_SM7XX)                += sm7xx/
  obj-$(CONFIG_DT3155)          += dt3155/
 +obj-$(CONFIG_VIDEO_DT3155)    += dt3155v4l/
  obj-$(CONFIG_CRYSTALHD)               += crystalhd/
 +obj-$(CONFIG_CXT1E1)          += cxt1e1/
 +obj-$(CONFIG_TI_ST)           += ti-st/
 +obj-$(CONFIG_ADIS16255)               += adis16255/
 +obj-$(CONFIG_FB_XGI)          += xgifb/
 +obj-$(CONFIG_TOUCHSCREEN_MRSTOUCH)    += mrst-touchscreen/
 +obj-$(CONFIG_MSM_STAGING)     += msm/