kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-09-26 18:16:26 +00:00
Code Issues Releases Packages Activity

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

Browse source 
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>
This commit is contained in:
Arnd Bergmann 2014-07-26 17:54:21 +02:00
commit 944483d033
7 changed files with 164 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files