ec868bdb35b66363bfe8998e4f522cb3743a160b - pub/scm/linux/kernel/git/mpe/linux-next

commit: ec868bdb35b66363bfe8998e4f522cb3743a160b
[log]
author: Michael Ellerman <mpe@ellerman.id.au>
Fri Jun 05 22:39:03 2015 +1000
committer: Michael Ellerman <mpe@ellerman.id.au>
Fri Jun 05 22:39:03 2015 +1000
tree: 5bb7106d83d4d47e4cc22e22d181b4ea62e53a4d
parent: 36469a05610408bbd1e4705a9e721bf2009135de [diff]
parent: 45be0ab9ce2e8142ff9f21d8d15debc5ee9d8603 [diff]

Merge branch 'akpm-current/current'

Conflicts:
	arch/x86/Kconfig
	arch/x86/kernel/machine_kexec_64.c
	drivers/staging/android/lowmemorykiller.c

tree: 5bb7106d83d4d47e4cc22e22d181b4ea62e53a4d