git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: de4ce2d bb176f6)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 23 Oct 2017 15:21:44 +0000 (17:21 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 23 Oct 2017 15:21:44 +0000 (17:21 +0200)
commit	6fbf248a20d362a92de60beee9474faca0b54eee
tree	b5365be73b420be3b6036fb40aaf1b167c90b180	tree
parent	de4ce2d1ad1bb3304d4107160c9551b7fd8d8ec5	commit \| diff
parent	bb176f67090ca54869fc1262c913aa69d2ede070	commit \| diff

Merge 4.14-rc6 into char-misc-next

We want the driver fixes in here and this resolves a merge issue with
the binder driver.

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/android/binder.c	diff1 \|	diff2 \|	blob \| history
drivers/android/binder_alloc.c	diff1 \|	diff2 \|	blob \| history
drivers/hv/channel_mgmt.c	diff1 \|	diff2 \|	blob \| history

MicroBlaze GIT Repository