Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9563355 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: Merge staging-next into Linus's tree 



Conflicts:
	drivers/staging/Kconfig
	drivers/staging/batman-adv/bat_sysfs.c
	drivers/staging/batman-adv/device.c
	drivers/staging/batman-adv/hard-interface.c
	drivers/staging/cx25821/cx25821-audups11.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parents cdd854bc b12d1995

arch/x86/kernel/cpu/mshyperv.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <asm/mshyperv.h>



struct ms_hyperv_info ms_hyperv;

EXPORT_SYMBOL_GPL(ms_hyperv);



static bool __init ms_hyperv_platform(void)

{

drivers/staging/Kconfig

+11 −3
Original line number Diff line number Diff line
@@ -97,6 +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"
@@ -115,7 +117,7 @@ source "drivers/staging/sep/Kconfig" 


source "drivers/staging/iio/Kconfig"



source "drivers/staging/ramzswap/Kconfig"

source "drivers/staging/zram/Kconfig"



source "drivers/staging/wlags49_h2/Kconfig"
@@ -127,8 +129,6 @@ source "drivers/staging/samsung-laptop/Kconfig" 


source "drivers/staging/sm7xx/Kconfig"



source "drivers/staging/dt3155/Kconfig"



source "drivers/staging/dt3155v4l/Kconfig"



source "drivers/staging/crystalhd/Kconfig"
@@ -147,5 +147,13 @@ source "drivers/staging/msm/Kconfig" 


source "drivers/staging/lirc/Kconfig"



source "drivers/staging/easycap/Kconfig"



source "drivers/staging/solo6x10/Kconfig"



source "drivers/staging/tidspbridge/Kconfig"



source "drivers/staging/quickstart/Kconfig"



endif # !STAGING_EXCLUDE_BUILD

endif # STAGING

drivers/staging/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -23,6 +23,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/
@@ -39,13 +40,12 @@ obj-$(CONFIG_VME_BUS) += vme/ 
obj-$(CONFIG_MRST_RAR_HANDLER)	+= memrar/

obj-$(CONFIG_DX_SEP)		+= sep/

obj-$(CONFIG_IIO)		+= iio/

obj-$(CONFIG_RAMZSWAP)		+= ramzswap/

obj-$(CONFIG_ZRAM)		+= zram/

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_FB_SM7XX)		+= sm7xx/

obj-$(CONFIG_DT3155)		+= dt3155/

obj-$(CONFIG_VIDEO_DT3155)	+= dt3155v4l/

obj-$(CONFIG_CRYSTALHD)		+= crystalhd/

obj-$(CONFIG_CXT1E1)		+= cxt1e1/
@@ -54,3 +54,7 @@ obj-$(CONFIG_ADIS16255) += adis16255/ 
obj-$(CONFIG_FB_XGI)		+= xgifb/

obj-$(CONFIG_TOUCHSCREEN_MRSTOUCH)	+= mrst-touchscreen/

obj-$(CONFIG_MSM_STAGING)	+= msm/

obj-$(CONFIG_EASYCAP)		+= easycap/

obj-$(CONFIG_SOLO6X10)		+= solo6x10/

obj-$(CONFIG_TIDSPBRIDGE)	+= tidspbridge/

obj-$(CONFIG_ACPI_QUICKSTART)	+= quickstart/

drivers/staging/batman-adv/CHANGELOG

+12 −0
Original line number Diff line number Diff line 
batman-adv 2010.0.0:



* support latest kernels (2.6.21 - 2.6.35)

* further code refactoring and cleaning for coding style

* move from procfs based configuration to sysfs

* reorganized sequence number handling

* limit queue lengths for batman and broadcast packets

* many bugs (endless loop and rogue packets on shutdown, wrong tcpdump output,

  missing frees in error situations, sleeps in atomic contexts) squashed



 -- Fri, 18 Jun 2010 21:34:26 +0200



batman-adv 0.2.1:



* support latest kernels (2.6.20 - 2.6.33)

drivers/staging/batman-adv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


config BATMAN_ADV

	tristate "B.A.T.M.A.N. Advanced Meshing Protocol"

	depends on PROC_FS && NET

	depends on NET

        default n

	---help---