Merge 3.6-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Sep 2012 00:17:25 +0000 (17:17 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Sep 2012 00:17:25 +0000 (17:17 -0700)
commit6a2a2cdd57d11ee3117539b846a45df6efbd35b1
treeb6ab218810666a75d6612bde4d4a224118c0834c
parent8e360ec82322358056786e651322085af3ef6960
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2
Merge 3.6-rc6 into staging-next

This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the
merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 files changed:
drivers/hid/hid-core.c
drivers/iio/adc/at91_adc.c
drivers/staging/iio/accel/lis3l02dq_ring.c
drivers/staging/iio/adc/ad7192.c
drivers/staging/iio/gyro/adis16260_core.c
drivers/staging/iio/imu/adis16400_core.c
drivers/staging/iio/meter/ade7753.c
drivers/staging/iio/meter/ade7754.c
drivers/staging/iio/meter/ade7759.c
drivers/staging/nvec/nvec.c
drivers/staging/vt6656/dpc.c
drivers/staging/vt6656/rxtx.c