review.tizen.org Git - platform/kernel/linux-exynos.git/commit

projects / platform / kernel / linux-exynos.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e347fa5 a798c10)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Tue, 22 Apr 2014 17:08:40 +0000 (10:08 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Tue, 22 Apr 2014 17:08:40 +0000 (10:08 -0700)
commit	3eb9992caff10b62cf0ed0bcb1667a58b13188fa
tree	abe4b4b586978773e2df21898eda611bc6eb822c	tree \| snapshot
parent	e347fa5f4271769bc31fb462631c213aa3824588	commit \| diff
parent	a798c10faf62a505d24e5f6213fbaf904a39623f	commit \| diff

Merge 3.15-rc2 into staging-next

This resolves a bunch of merge errors with other fixes that are already
in Linus's tree.

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

Domain: System / Kernel;