git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 03eea7c fd9f5ed)

author	Arnd Bergmann <arnd@arndb.de>
	Sat, 26 Jul 2014 15:54:21 +0000 (17:54 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Sat, 26 Jul 2014 15:54:21 +0000 (17:54 +0200)
commit	944483d0330bb497549977aa9649be6b7d0ede37
tree	545d9c5498e0dbe7697b36ad50379a815b48ec1b	tree \| snapshot (tar.gz zip)
parent	03eea7cda20128f97fa281650ada69fe19194d56	commit \| diff
parent	fd9f5edf6e7e8a666f3672fd809f3289c2da388a	commit \| diff

Merge branch 'next/fixes-non-critical' into next/soc

This resolves a nontrivial conflict against a bug fix
in another branch.

Conflicts:
arch/arm/mach-exynos/pm.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap5.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/pm.c	diff1 \|	diff2 \|	blob \| history