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

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

Thu, 15 Sep 2011 04:33:40 +0000 (14:33 +1000)

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

Thu, 15 Sep 2011 04:33:40 +0000 (14:33 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 Sep 2011 04:33:40 +0000 (14:33 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 Sep 2011 04:33:40 +0000 (14:33 +1000)
diff --cc fs/eventpoll.c
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
diff --cc lib/idr.c
Simple merge
diff --cc mm/vmscan.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 15 Sep 2011 04:33:40 +0000 (14:33 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 15 Sep 2011 04:33:40 +0000 (14:33 +1000)
		1	2
fs/eventpoll.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	patch \|	diff1 \|	diff2 \|	blob \| history
lib/idr.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	patch \|	diff1 \|	diff2 \|	blob \| history