git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 22 Sep 2014 14:30:03 +0000 (07:30 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 22 Sep 2014 14:30:03 +0000 (07:30 -0700)
commit	d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a
tree	ea756d49395ac4a08d6cdff98d74e60384a322a6	tree \| snapshot
parent	3f76a4ea5383ba2f9e76f9625f77ff246907a134	commit \| diff
parent	0f33be009b89d2268e94194dc4fd01a7851b6d51	commit \| diff

Merge 3.17-rc6 into staging-next.

We want the fixes in there, and it resolves a merge issue with
drivers/iio/accel/bma180.c

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

Linux kernel for KaRo TX COM modules

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/iio/accel/bma180.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/at91_adc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/xilinx-xadc-core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6655/hostap.c	diff1 \|	diff2 \|	blob \| history