rtime.felk.cvut.cz Git - linux-imx.git/commit

]> rtime.felk.cvut.cz Git - linux-imx.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 27 May 2013 01:54:33 +0000 (10:54 +0900)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 27 May 2013 01:54:33 +0000 (10:54 +0900)
commit	829455bb0e994373519e3c58d403fc1148f44630
tree	7e4a250eb8208e2a7fa2787b03d2cf989a8ccc5a	tree \| snapshot
parent	42b4212baa28ebb07147c1de3990c596e7612e97	commit \| diff
parent	e4aa937ec75df0eea0bee03bffa3303ad36c986b	commit \| diff

Merge 3.10-rc3 into staging-next

We want the changes here, and we resolve the merge conflict that was
happening in the nvec_kbd.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Local Linux development repo for Freescale iMX

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/exynos_adc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/comedi_buf.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/comedi_fops.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/ni_labpc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/ni_labpc.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/ni_mio_common.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/dwc2/hcd_intr.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/adc/mxs-lradc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/imx-tve.c	diff1 \|	diff2 \|	blob \| history