Commit ce519e23 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (237 commits)
  Staging: android: binder: fix build errors
  Staging: android: add lowmemorykiller driver
  Staging: android: remove dummy android.c driver
  Staging: android: timed_gpio: Rename android_timed_gpio to timed_gpio
  Staging: android: add timed_gpio driver
  Staging: android: add ram_console driver
  Staging: android: add logging driver
  staging: android: binder: Fix use of euid
  Staging: android: binder: Fix gcc warnings about improper format specifiers for size_t in printk
  Staging: android: add binder driver
  Staging: add android framework
  Staging: epl: fix netdev->priv b0rkage
  Staging: epl: hr timers all run in hard irq context now
  Staging: epl: run Lindent on *.c files
  Staging: epl: run Lindent on *.h files
  Staging: epl: run Lindent on all user/*.h files
  Staging: epl: run Lindent on all kernel/*.h files
  Staging: add epl stack
  Staging: frontier: fix compiler warnings
  Staging: frontier: remove unused alphatrack_sysfs.c file
  ...
parents 40d7ee5d 7a9c67a6

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1325,6 +1325,8 @@ source "drivers/regulator/Kconfig" 


source "drivers/uio/Kconfig"



source "drivers/staging/Kconfig"



endmenu



source "fs/Kconfig"

arch/cris/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -681,6 +681,8 @@ source "drivers/usb/Kconfig" 


source "drivers/uwb/Kconfig"



source "drivers/staging/Kconfig"



source "arch/cris/Kconfig.debug"



source "security/Kconfig"

arch/h8300/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -220,6 +220,8 @@ source "drivers/uwb/Kconfig" 


endmenu



source "drivers/staging/Kconfig"



source "fs/Kconfig"



source "arch/h8300/Kconfig.debug"

drivers/staging/Kconfig

+32 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ source "drivers/staging/sxg/Kconfig" 


source "drivers/staging/me4000/Kconfig"



source "drivers/staging/meilhaus/Kconfig"



source "drivers/staging/go7007/Kconfig"



source "drivers/staging/usbip/Kconfig"
@@ -63,5 +65,35 @@ source "drivers/staging/at76_usb/Kconfig" 


source "drivers/staging/poch/Kconfig"



source "drivers/staging/agnx/Kconfig"



source "drivers/staging/otus/Kconfig"



source "drivers/staging/rt2860/Kconfig"



source "drivers/staging/rt2870/Kconfig"



source "drivers/staging/benet/Kconfig"



source "drivers/staging/comedi/Kconfig"



source "drivers/staging/asus_oled/Kconfig"



source "drivers/staging/panel/Kconfig"



source "drivers/staging/altpciechdma/Kconfig"



source "drivers/staging/rtl8187se/Kconfig"



source "drivers/staging/rspiusb/Kconfig"



source "drivers/staging/mimio/Kconfig"



source "drivers/staging/frontier/Kconfig"



source "drivers/staging/epl/Kconfig"



source "drivers/staging/android/Kconfig"



endif # !STAGING_EXCLUDE_BUILD

endif # STAGING

drivers/staging/Makefile

+16 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_ET131X) += et131x/ 
obj-$(CONFIG_SLICOSS)		+= slicoss/

obj-$(CONFIG_SXG)		+= sxg/

obj-$(CONFIG_ME4000)		+= me4000/

obj-$(CONFIG_MEILHAUS)		+= meilhaus/

obj-$(CONFIG_VIDEO_GO7007)	+= go7007/

obj-$(CONFIG_USB_IP_COMMON)	+= usbip/

obj-$(CONFIG_W35UND)		+= winbond/
@@ -14,3 +15,18 @@ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ 
obj-$(CONFIG_ECHO)		+= echo/

obj-$(CONFIG_USB_ATMEL)		+= at76_usb/

obj-$(CONFIG_POCH)		+= poch/

obj-$(CONFIG_AGNX)		+= agnx/

obj-$(CONFIG_OTUS)		+= otus/

obj-$(CONFIG_RT2860)		+= rt2860/

obj-$(CONFIG_RT2870)		+= rt2870/

obj-$(CONFIG_BENET)		+= benet/

obj-$(CONFIG_COMEDI)		+= comedi/

obj-$(CONFIG_ASUS_OLED)		+= asus_oled/

obj-$(CONFIG_PANEL)		+= panel/

obj-$(CONFIG_ALTERA_PCIE_CHDMA)	+= altpciechdma/

obj-$(CONFIG_RTL8187SE)		+= rtl8187se/

obj-$(CONFIG_USB_RSPI)		+= rspiusb/

obj-$(CONFIG_INPUT_MIMIO)	+= mimio/

obj-$(CONFIG_TRANZPORT)		+= frontier/

obj-$(CONFIG_EPL)		+= epl/

obj-$(CONFIG_ANDROID)		+= android/

CRA Git | Maintained and supported by SUSTech CRA and CCSE