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	ed46d4a62730fa1f3e28998f73ce37d4fe80da0e
tree	b7b0fcbf594db884a68cbc354ed933b5c8ad6d61	tree \| snapshot
parent	96233a222632ad6a21a89b69f3fbf769b4338c52	commit \| diff
parent	69bc2ec6c364fc74f65859f9f951a6588a42a6be	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