git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 15 Sep 2014 02:33:47 +0000 (19:33 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 15 Sep 2014 02:33:47 +0000 (19:33 -0700)
commit	fe275ea083a9341e928929f5ba153bd43d46fed6
tree	b7b0fcbf594db884a68cbc354ed933b5c8ad6d61	tree \| snapshot
parent	75edebca44e61667f37fb595a6a208990e78454d	commit \| diff
parent	a8bdd51f99d9b1667cdf699af3043328c3c16911	commit \| diff

Merge 3.17-rc5 into staging-next.

This fixes a merge conflict in lustre, and we want the other fixes that
went into 3.17-rc5 as well.

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

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/sync.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/imx-drm/ipuv3-plane.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/llite_lib.c	diff1 \|	diff2 \|	blob \| history