Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Aug 2010 17:44:06 +0000 (10:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Aug 2010 17:44:06 +0000 (10:44 -0700)
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (88 commits)
  ips driver: make it less chatty
  intel_scu_ipc: fix size field for intel_scu_ipc_command
  intel_scu_ipc: return -EIO for error condition in busy_loop
  intel_scu_ipc: fix data packing of PMIC command on Moorestown
  Clean up command packing on MRST.
  zero the stack buffer before giving random garbage to the SCU
  Fix stack buffer size for IPC writev messages
  intel_scu_ipc: Use the new cpu identification function
  intel_scu_ipc: tidy up unused bits
  Remove indirect read write api support.
  intel_scu_ipc: Support Medfield processors
  intel_scu_ipc: detect CPU type automatically
  x86 plat: limit x86 platform driver menu to X86
  acpi ec_sys: Be more cautious about ec write access
  acpi ec: Fix possible double io port registration
  hp-wmi: acpi_drivers.h is already included through acpi.h two lines below
  hp-wmi: Fix mixing up of and/or directive
  dell-laptop: make dell_laptop_i8042_filter() static
  asus-laptop: fix asus_input_init error path
  msi-wmi: make needlessly global symbols static
  ...

1  2 
drivers/staging/Kconfig
drivers/staging/Makefile

diff --combined drivers/staging/Kconfig
index 9296517258553dece8f2dae6dc5829c116933b93,9dfef8a5997456b5c2587657d57c0b03681fabe9..0e4122ed1b363fd8581d71268b24d1720c664562
@@@ -109,8 -109,6 +109,6 @@@ source "drivers/staging/hv/Kconfig
  
  source "drivers/staging/vme/Kconfig"
  
- source "drivers/staging/rar_register/Kconfig"
  source "drivers/staging/memrar/Kconfig"
  
  source "drivers/staging/sep/Kconfig"
@@@ -147,7 -145,5 +145,7 @@@ source "drivers/staging/mrst-touchscree
  
  source "drivers/staging/msm/Kconfig"
  
 +source "drivers/staging/lirc/Kconfig"
 +
  endif # !STAGING_EXCLUDE_BUILD
  endif # STAGING
diff --combined drivers/staging/Makefile
index 6c5b5237ccb9fdf472cc8bbc28868edef7864a83,3dbf681ca64ec97bce3cbd354c5c9b1254639729..ecfb0bb990b6222d1cc7fcbee550bf6ec1c8856c
@@@ -8,7 -8,6 +8,7 @@@ obj-$(CONFIG_SLICOSS)            += slicoss
  obj-$(CONFIG_VIDEO_GO7007)    += go7007/
  obj-$(CONFIG_VIDEO_CX25821)   += cx25821/
  obj-$(CONFIG_VIDEO_TM6000)    += tm6000/
 +obj-$(CONFIG_LIRC_STAGING)    += lirc/
  obj-$(CONFIG_USB_IP_COMMON)   += usbip/
  obj-$(CONFIG_W35UND)          += winbond/
  obj-$(CONFIG_PRISM2_USB)      += wlan-ng/
@@@ -36,7 -35,6 +36,6 @@@ obj-$(CONFIG_VT6656)          += vt6656
  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/