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

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

Tue, 16 Oct 2012 00:42:00 +0000 (11:42 +1100)

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

Tue, 16 Oct 2012 00:42:00 +0000 (11:42 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 00:42:00 +0000 (11:42 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 00:42:00 +0000 (11:42 +1100)
diff --cc drivers/char/ppdev.c
Simple merge
diff --cc mm/util.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 16 Oct 2012 00:42:00 +0000 (11:42 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 16 Oct 2012 00:42:00 +0000 (11:42 +1100)
		1	2
drivers/char/ppdev.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/util.c	patch \|	diff1 \|	diff2 \|	blob \| history