Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree ...

This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2010-10-28 09:44:56 -07:00

..

c2port

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

cb710

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

eeprom

i2c: Remove all i2c_set_clientdata(client, NULL) in drivers

2010-06-03 11:33:58 +02:00

ibmasm

fs: do not assign default i_ino in new_inode

2010-10-25 21:26:11 -04:00

iwmc3200top

net/wireless: use generic_file_llseek in debugfs

2010-09-16 10:33:08 +02:00

sgi-gru

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

sgi-xp

sgi-xp: incoming XPC channel messages can come in after the channel's partition structures have been torn down

2010-10-26 16:52:03 -07:00

ti-st

drivers: misc: ti-st: fix review comments

2010-10-14 12:41:10 -07:00

ad525x_dpot-i2c.c

drivers/misc/ad525x_dpot.c: new features

2010-10-26 16:52:14 -07:00

ad525x_dpot-spi.c

drivers/misc/ad525x_dpot.c: new features

2010-10-26 16:52:14 -07:00

ad525x_dpot.c

drivers/misc/ad525x_dpot.c: new features

2010-10-26 16:52:14 -07:00

ad525x_dpot.h

ad525x_dpot: use correct rdac channel for ad5251/ad5252

2010-10-26 16:52:14 -07:00

apds990x.c

drivers/misc: driver for APDS990X ALS and proximity sensors

2010-10-26 16:52:14 -07:00

apds9802als.c

drivers/misc/apds9802als.c: add runtime PM support

2010-10-26 16:52:15 -07:00

arm-charlcd.c

ARM: 6214/2: driver for the character LCD found in ARM refdesigns

2010-07-26 10:48:28 +01:00

atmel_pwm.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

atmel_tclib.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

atmel-ssc.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

bh1770glc.c

drivers/misc: driver for bh1770glc / sfh7770 ALS and proximity sensor

2010-10-26 16:52:14 -07:00

bh1780gli.c

i2c: Remove obsolete cleanup for clientdata

2010-09-30 14:14:22 +02:00

bmp085.c

drivers/misc: support for the pressure sensor BMP085 from Bosch Sensortec

2010-08-09 20:45:05 -07:00

cs5535-mfgpt.c

cs5535-mfgpt: reuse timers that have never been set up

2010-08-11 08:59:20 -07:00

ds1682.c

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

enclosure.c

[SCSI] enclosure: fix error path - actually return ERR_PTR() on error

2010-07-27 12:03:48 -05:00

ep93xx_pwm.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

hmc6352.c

hmc6352: add driver for the HMC6352 compass

2010-08-09 20:45:10 -07:00

hpilo.c

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

2010-10-22 19:36:42 -07:00

hpilo.h

hpilo: fix pointer warning in ilo_ccb_setup

2010-08-09 20:45:05 -07:00

ics932s401.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ioc4.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

isl29003.c

isl29003: fix resume functionality

2009-05-06 16:36:10 -07:00

isl29020.c

drivers/misc/isl29020.c: ambient light sensor

2010-10-26 16:52:15 -07:00

Kconfig

Merge 'staging-next' to Linus's tree

2010-10-28 09:44:56 -07:00

kgdbts.c

kgdbts,sh: Add in breakpoint pc offset for superh

2010-04-02 14:58:17 -05:00

lkdtm.c

lkdtm: prefix enum constants

2010-10-26 16:52:14 -07:00

Makefile

Merge 'staging-next' to Linus's tree

2010-10-28 09:44:56 -07:00

pch_phub.c

pch_phub: fix build warnings

2010-10-22 10:16:42 -07:00

phantom.c

drivers/misc/phantom.c: add missing warning messages in phantom_probe()

2010-10-26 16:52:14 -07:00

ti_dac7512.c

drivers/misc: add driver for Texas Instruments DAC7512

2009-12-15 08:53:25 -08:00

tifm_7xx1.c

dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)

2009-04-07 08:31:11 -07:00

tifm_core.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

tsl2550.c

tsl2550: Move from i2c/chips to misc

2010-03-13 20:56:54 +01:00

vmw_balloon.c

vmware balloon: rename module

2010-09-22 17:22:38 -07:00