Merge branch 'linus'

author Ingo Molnar <mingo@kernel.org>

Wed, 22 Aug 2012 07:53:03 +0000 (09:53 +0200)

committer Ingo Molnar <mingo@kernel.org>

Wed, 22 Aug 2012 07:53:03 +0000 (09:53 +0200)
author Ingo Molnar <mingo@kernel.org>
Wed, 22 Aug 2012 07:53:03 +0000 (09:53 +0200)
committer Ingo Molnar <mingo@kernel.org>
Wed, 22 Aug 2012 07:53:03 +0000 (09:53 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc mm/mmap.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Wed, 22 Aug 2012 07:53:03 +0000 (09:53 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Wed, 22 Aug 2012 07:53:03 +0000 (09:53 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	patch \|	diff1 \|	diff2 \|	blob \| history