Merge remote-tracking branch 'tmem/linux-next'

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

Mon, 2 Apr 2012 02:53:48 +0000 (12:53 +1000)

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

Mon, 2 Apr 2012 02:53:48 +0000 (12:53 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 02:53:48 +0000 (12:53 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 02:53:48 +0000 (12:53 +1000)
diff --cc include/linux/swap.h
Simple merge
diff --cc mm/swapfile.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 2 Apr 2012 02:53:48 +0000 (12:53 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 2 Apr 2012 02:53:48 +0000 (12:53 +1000)
		1	2
include/linux/swap.h	patch \|	diff1 \|	diff2 \|	blob \| history
mm/swapfile.c	patch \|	diff1 \|	diff2 \|	blob \| history