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

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

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
  staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
  staging:iio:kfifo_buf fix double initialization of the ring device structure.
  staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
  staging:iio:imu fix missing register table index for some channels
  spectra: enable device before poking it
  staging: rts_pstor: Fix a miswriting
  staging/lirc_bt829: Return -ENODEV when no hardware is found.
  staging/lirc_parallel: remove pointless prototypes.
  staging/lirc_parallel: fix panic on rmmod
  staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
  Staging: zram: Fix kunmapping order
  Revert "gma500: Fix dependencies"
  gma500: Add medfield header
  gma500: wire up the mrst i2c bus from chip_info
  gma500: Fix DPU build
  gma500: Clean up the DPU config and make it runtime
  gma500: resync with Medfield progress
  gma500: Use the mrst helpers and power control for mode commit
  gma500@ Fix backlight range error
  gma500: More Moorestown muddle meddling means MM maybe might modeset
  ...

Fix up fairly trivial conflicts all over, mostly due to header file
cleanup conflicts, but some deleted files and some just context changes:
 - Documentation/feature-removal-schedule.txt
 - drivers/staging/bcm/headers.h
 - drivers/staging/brcm80211/brcmfmac/dhd_linux.c
 - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
 - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
 - drivers/staging/brcm80211/brcmfmac/wl_iw.c
 - drivers/staging/et131x/et131x_netdev.c
 - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
 - drivers/staging/rtl8192e/r8192E.h
 - drivers/staging/usbip/userspace/src/utils.h
parents d5ef6423 e1703b32

Documentation/feature-removal-schedule.txt

+0 −14
Original line number Diff line number Diff line
@@ -193,20 +193,6 @@ Why: /proc/<pid>/oom_adj allows userspace to influence the oom killer's 


---------------------------



What:	CS5535/CS5536 obsolete GPIO driver

When:	June 2011

Files:	drivers/staging/cs5535_gpio/*

Check:	drivers/staging/cs5535_gpio/cs5535_gpio.c

Why:	A newer driver replaces this; it is drivers/gpio/cs5535-gpio.c, and

	integrates with the Linux GPIO subsystem.  The old driver has been

	moved to staging, and will be removed altogether around 3.0.

	Please test the new driver, and ensure that the functionality you

	need and any bugfixes from the old driver are available in the new

	one.

Who:	Andres Salomon <dilinger@queued.net>



--------------------------



What:	remove EXPORT_SYMBOL(kernel_thread)

When:	August 2006

Files:	arch/*/kernel/*_ksyms.c

MAINTAINERS

+141 −8
Original line number Diff line number Diff line
@@ -1546,9 +1546,10 @@ F: drivers/net/tg3.* 
BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER

M:	Brett Rudley <brudley@broadcom.com>

M:	Henry Ptasinski <henryp@broadcom.com>

M:	Dowan Kim <dowan@broadcom.com>

M:	Roland Vossen <rvossen@broadcom.com>

M:	Arend van Spriel <arend@broadcom.com>

M:	Franky (Zhenhui) Lin <frankyl@broadcom.com>

M:	Kan Yan	<kanyan@broadcom.com>

L:	linux-wireless@vger.kernel.org

S:	Supported

F:	drivers/staging/brcm80211/
@@ -6092,6 +6093,145 @@ L: devel@driverdev.osuosl.org 
S:	Maintained

F:	drivers/staging/



STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS

M:	Henk de Groot <pe1dnn@amsat.org>

S:	Odd Fixes

F:	drivers/staging/wlags49_h2/

F:	drivers/staging/wlags49_h25/



STAGING - ASUS OLED

M:	Jakub Schmidtke <sjakub@gmail.com>

S:	Odd Fixes

F:	drivers/staging/asus_oled/



STAGING - ATHEROS ATH6KL WIRELESS DRIVER

M:	Luis R. Rodriguez <mcgrof@gmail.com>

M:	Naveen Singh <nsingh@atheros.com>

S:	Odd Fixes

F:	drivers/staging/ath6kl/



STAGING - COMEDI

M:	Ian Abbott <abbotti@mev.co.uk>

M:	Mori Hess <fmhess@users.sourceforge.net>

S:	Odd Fixes

F:	drivers/staging/comedi/



STAGING - CRYSTAL HD VIDEO DECODER

M:	Naren Sankar <nsankar@broadcom.com>

M:	Jarod Wilson <jarod@wilsonet.com>

M:	Scott Davilla <davilla@4pi.com>

M:	Manu Abraham <abraham.manu@gmail.com>

S:	Odd Fixes

F:	drivers/staging/crystalhd/



STAGING - CYPRESS WESTBRIDGE SUPPORT

M:	David Cross <david.cross@cypress.com>

S:	Odd Fixes

F:	drivers/staging/westbridge/



STAGING - ECHO CANCELLER

M:	Steve Underwood <steveu@coppice.org>

M:	David Rowe <david@rowetel.com>

S:	Odd Fixes

F:	drivers/staging/echo/



STAGING - FLARION FT1000 DRIVERS

M:	Marek Belisko <marek.belisko@gmail.com>

S:	Odd Fixes

F:	drivers/staging/ft1000/



STAGING - FRONTIER TRANZPORT AND ALPHATRACK

M:	David Täht <d@teklibre.com>

S:	Odd Fixes

F:	drivers/staging/frontier/



STAGING - HYPER-V (MICROSOFT)

M:	Hank Janssen <hjanssen@microsoft.com>

M:	Haiyang Zhang <haiyangz@microsoft.com>

S:	Odd Fixes

F:	drivers/staging/hv/



STAGING - INDUSTRIAL IO

M:	Jonathan Cameron <jic23@cam.ac.uk>

L:	linux-iio@vger.kernel.org

S:	Odd Fixes

F:	drivers/staging/iio/



STAGING - LIRC (LINUX INFRARED REMOTE CONTROL) DRIVERS

M:	Jarod Wilson <jarod@wilsonet.com>

W:	http://www.lirc.org/

S:	Odd Fixes

F:	drivers/staging/lirc/



STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)

M:	Andres Salomon <dilinger@queued.net>

M:	Chris Ball <cjb@laptop.org>

M:	Jon Nettleton <jon.nettleton@gmail.com>

W:	http://wiki.laptop.org/go/DCON

S:	Odd Fixes

F:	drivers/staging/olpc_dcon/



STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER

M:	Willy Tarreau <willy@meta-x.org>

S:	Odd Fixes

F:	drivers/staging/panel/



STAGING - REALTEK RTL8712U DRIVERS

M:	Larry Finger <Larry.Finger@lwfinger.net>

M:	Florian Schilhabel <florian.c.schilhabel@googlemail.com>.

S:	Odd Fixes

F:	drivers/staging/rtl8712/



STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER

M:	Teddy Wang <teddy.wang@siliconmotion.com.cn>

S:	Odd Fixes

F:	drivers/staging/sm7xx/



STAGING - SOFTLOGIC 6x10 MPEG CODEC

M:	Ben Collins <bcollins@bluecherry.net>

S:	Odd Fixes

F:	drivers/staging/solo6x10/



STAGING - SPEAKUP CONSOLE SPEECH DRIVER

M:	William Hubbs <w.d.hubbs@gmail.com>

M:	Chris Brannon <chris@the-brannons.com>

M:	Kirk Reiser <kirk@braille.uwo.ca>

M:	Samuel Thibault <samuel.thibault@ens-lyon.org>

L:	speakup@braille.uwo.ca

W:	http://www.linux-speakup.org/

S:	Odd Fixes

F:	drivers/staging/speakup/



STAGING - TI DSP BRIDGE DRIVERS

M:	Omar Ramirez Luna <omar.ramirez@ti.com>

S:	Odd Fixes

F:	drivers/staging/tidspbridge/



STAGING - TRIDENT TVMASTER TMxxxx USB VIDEO CAPTURE DRIVERS

L:	linux-media@vger.kernel.org

S:	Odd Fixes

F:	drivers/staging/tm6000/



STAGING - USB ENE SM/MS CARD READER DRIVER

M:	Al Cho <acho@novell.com>

S:	Odd Fixes

F:	drivers/staging/keucr/



STAGING - VIA VT665X DRIVERS

M:	Forest Bond <forest@alittletooquiet.net>

S:	Odd Fixes

F:	drivers/staging/vt665?/



STAGING - WINBOND IS89C35 WLAN USB DRIVER

M:	Pavel Machek <pavel@ucw.cz>

S:	Odd Fixes

F:	drivers/staging/winbond/



STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER

M:	Arnaud Patard <apatard@mandriva.com>

S:	Odd Fixes

F:	drivers/staging/xgifb/



STARFIRE/DURALAN NETWORK DRIVER

M:	Ion Badulescu <ionut@badula.org>

S:	Odd Fixes
@@ -6594,13 +6734,6 @@ W: http://pegasus2.sourceforge.net/ 
S:	Maintained

F:	drivers/net/usb/rtl8150.c



USB SE401 DRIVER

L:	linux-usb@vger.kernel.org

W:	http://www.chello.nl/~j.vreeken/se401/

S:	Orphan

F:	Documentation/video4linux/se401.txt

F:	drivers/staging/se401/



USB SERIAL BELKIN F5U103 DRIVER

M:	William Greathouse <wgreathouse@smva.com>

L:	linux-usb@vger.kernel.org

arch/arm/mach-ux500/board-mop500-u8500uib.c

+2 −22
Original line number Diff line number Diff line
@@ -12,34 +12,14 @@ 
#include <linux/interrupt.h>

#include <linux/mfd/tc3589x.h>

#include <linux/input/matrix_keypad.h>

#include <../drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h>



#include <mach/gpio.h>

#include <mach/irqs.h>



#include "board-mop500.h"



/*

 * Synaptics RMI4 touchscreen interface on the U8500 UIB

 */



/*

 * Descriptor structure.

 * Describes the number of i2c devices on the bus that speak RMI.

 */

static struct synaptics_rmi4_platform_data rmi4_i2c_dev_platformdata = {

	.irq_number     = NOMADIK_GPIO_TO_IRQ(84),

	.irq_type       = (IRQF_TRIGGER_FALLING | IRQF_SHARED),

	.x_flip		= false,

	.y_flip		= true,

	.regulator_en   = false,

};



static struct i2c_board_info __initdata mop500_i2c3_devices_u8500[] = {

	{

		I2C_BOARD_INFO("synaptics_rmi4_i2c", 0x4B),

		.platform_data = &rmi4_i2c_dev_platformdata,

	},

/* Dummy data that can be overridden by staging driver */

struct i2c_board_info __initdata __weak mop500_i2c3_devices_u8500[] = {

};



/*

drivers/staging/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ menuconfig STAGING 


if STAGING



source "drivers/staging/tty/Kconfig"



source "drivers/staging/generic_serial/Kconfig"



source "drivers/staging/et131x/Kconfig"



source "drivers/staging/slicoss/Kconfig"
@@ -100,8 +96,6 @@ source "drivers/staging/sep/Kconfig" 


source "drivers/staging/iio/Kconfig"



source "drivers/staging/cs5535_gpio/Kconfig"



source "drivers/staging/zram/Kconfig"



source "drivers/staging/zcache/Kconfig"
@@ -120,8 +114,6 @@ source "drivers/staging/cxt1e1/Kconfig" 


source "drivers/staging/xgifb/Kconfig"



source "drivers/staging/msm/Kconfig"



source "drivers/staging/lirc/Kconfig"



source "drivers/staging/easycap/Kconfig"
@@ -132,8 +124,6 @@ source "drivers/staging/tidspbridge/Kconfig" 


source "drivers/staging/quickstart/Kconfig"



source "drivers/staging/westbridge/Kconfig"



source "drivers/staging/sbe-2t3e3/Kconfig"



source "drivers/staging/ath6kl/Kconfig"

drivers/staging/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
# fix for build system bug...

obj-$(CONFIG_STAGING)		+= staging.o



obj-y += tty/

obj-y += generic_serial/

obj-$(CONFIG_ET131X)		+= et131x/

obj-$(CONFIG_SLICOSS)		+= slicoss/

obj-$(CONFIG_VIDEO_GO7007)	+= go7007/
@@ -41,7 +39,6 @@ obj-$(CONFIG_HYPERV) += hv/ 
obj-$(CONFIG_VME_BUS)		+= vme/

obj-$(CONFIG_DX_SEP)            += sep/

obj-$(CONFIG_IIO)		+= iio/

obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio/

obj-$(CONFIG_ZRAM)		+= zram/

obj-$(CONFIG_XVMALLOC)		+= zram/

obj-$(CONFIG_ZCACHE)		+= zcache/
@@ -52,12 +49,10 @@ obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/ 
obj-$(CONFIG_CRYSTALHD)		+= crystalhd/

obj-$(CONFIG_CXT1E1)		+= cxt1e1/

obj-$(CONFIG_FB_XGI)		+= xgifb/

obj-$(CONFIG_MSM_STAGING)	+= msm/

obj-$(CONFIG_EASYCAP)		+= easycap/

obj-$(CONFIG_SOLO6X10)		+= solo6x10/

obj-$(CONFIG_TIDSPBRIDGE)	+= tidspbridge/

obj-$(CONFIG_ACPI_QUICKSTART)	+= quickstart/

obj-$(CONFIG_WESTBRIDGE_ASTORIA)	+= westbridge/astoria/

obj-$(CONFIG_SBE_2T3E3)		+= sbe-2t3e3/

obj-$(CONFIG_ATH6K_LEGACY)	+= ath6kl/

obj-$(CONFIG_USB_ENESTORAGE)	+= keucr/

CRA Git | Maintained and supported by SUSTech CRA and CCSE