]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 05:34:22 +0000 (15:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 05:34:22 +0000 (15:34 +1000)
commitbb6708245853b24976d95853e06ee4553d71c841
treeed06b9c3cb1ddebcd4419390dc6aa9c205045e9d
parent7e2010430fd1ff767b85a31c32b49cd6d59fda50
parent42b4212baa28ebb07147c1de3990c596e7612e97
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/nvec/nvec_kbd.c
MAINTAINERS
drivers/iio/adc/exynos_adc.c
drivers/staging/Kconfig
drivers/staging/comedi/comedi_buf.c
drivers/staging/comedi/comedi_fops.c
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/comedi/drivers/ni_labpc.h
drivers/staging/comedi/drivers/ni_mio_common.c
drivers/staging/dwc2/hcd_intr.c
drivers/staging/iio/adc/mxs-lradc.c
drivers/staging/imx-drm/imx-tve.c