git.stricted.de - GitHub/LineageOS/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 80d2623 15c03dd)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 30 Sep 2013 01:27:03 +0000 (18:27 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 30 Sep 2013 01:27:03 +0000 (18:27 -0700)
commit	d7173493683853047d6efc8d4454c70469a7b033
tree	8e6dac16d3104494b5cc2f33756c582ecdc3b753	tree \| snapshot (tar.gz zip)
parent	80d26236c7c583ea2f43b68008ab7e067102c62c	commit \| diff
parent	15c03dd4859ab16f9212238f29dd315654aa94f6	commit \| diff

Merge 3.12-rc3 into char-misc-next

We need/want the mei fixes in here so we can apply other updates that
are depending on them.

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

drivers/hv/connection.c	diff1 \|	diff2 \|	blob \| history
drivers/hv/hv_util.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/mei/amthif.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/mei/client.h	diff1 \|	diff2 \|	blob \| history
drivers/misc/mei/hbm.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/mei/main.c	diff1 \|	diff2 \|	blob \| history
include/linux/hyperv.h	diff1 \|	diff2 \|	blob \| history