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

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

Tue, 23 Aug 2011 03:46:37 +0000 (13:46 +1000)

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

Tue, 23 Aug 2011 03:46:37 +0000 (13:46 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Aug 2011 03:46:37 +0000 (13:46 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Aug 2011 03:46:37 +0000 (13:46 +1000)
diff --cc fs/eventpoll.c
Simple merge
diff --cc lib/idr.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 23 Aug 2011 03:46:37 +0000 (13:46 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 23 Aug 2011 03:46:37 +0000 (13:46 +1000)
		1	2
fs/eventpoll.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/idr.c	patch \|	diff1 \|	diff2 \|	blob \| history