Merge branch 'master' into next

author James Morris <jmorris@macbook.(none)>

Thu, 3 Dec 2009 06:33:40 +0000 (12:03 +0530)

committer James Morris <jmorris@macbook.(none)>

Thu, 3 Dec 2009 06:33:40 +0000 (12:03 +0530)
author James Morris <jmorris@macbook.(none)>
Thu, 3 Dec 2009 06:33:40 +0000 (12:03 +0530)
committer James Morris <jmorris@macbook.(none)>
Thu, 3 Dec 2009 06:33:40 +0000 (12:03 +0530)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc fs/exec.c
Simple merge
diff --cc include/linux/Kbuild
Simple merge
author	James Morris <jmorris@macbook.(none)>
	Thu, 3 Dec 2009 06:33:40 +0000 (12:03 +0530)
committer	James Morris <jmorris@macbook.(none)>
	Thu, 3 Dec 2009 06:33:40 +0000 (12:03 +0530)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
fs/exec.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/Kbuild	patch \|	diff1 \|	diff2 \|	blob \| history