git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3c9a679 a99cde4)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 4 Jul 2016 15:15:03 +0000 (08:15 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 4 Jul 2016 15:15:03 +0000 (08:15 -0700)
commit	7813029a509c0c92a5b16d846defaa50a2d3d7f1
tree	1962ab81537b7155d185f4b0b06c0323ff4dc509	tree \| snapshot
parent	3c9a6793bde1feb368cd6ef113c08a40a37f7517	commit \| diff
parent	a99cde438de0c4c0cecc1d1af1a55a75b10bfdef	commit \| diff

Merge 4.7-rc6 into staging-next

We want the staging fixes in here as well.

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

.mailmap	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad7266.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/accel/sca3000_core.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git