Merge remote-tracking branch 'vfs/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 11 Oct 2012 23:36:11 +0000 (10:36 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 11 Oct 2012 23:36:11 +0000 (10:36 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 23:36:11 +0000 (10:36 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 23:36:11 +0000 (10:36 +1100)
diff --cc fs/ext3/super.c
Simple merge
diff --cc include/linux/audit.h
Simple merge
diff --cc include/linux/fs.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 11 Oct 2012 23:36:11 +0000 (10:36 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 11 Oct 2012 23:36:11 +0000 (10:36 +1100)
		1	2
fs/ext3/super.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/audit.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history