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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 197f4d6 9eccca0)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 9 Mar 2015 07:13:01 +0000 (08:13 +0100)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 9 Mar 2015 07:13:01 +0000 (08:13 +0100)
commit	355a73f07d1da405728c9e57afd6eede340788f4
tree	bca9d993a19c9cf0940231323ad74fbec605b044	tree \| snapshot
parent	197f4d6a4a00915b29fa7ec71f8010b9c763e676	commit \| diff
parent	9eccca0843205f87c00404b663188b88eb248051	commit \| diff

Merge 4.0-rc3 into staging-next

We want the staging fixes in here as well.

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/adv_pci1710.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/comedi_isadma.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules