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

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

Wed, 11 Apr 2012 03:51:03 +0000 (13:51 +1000)

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

Wed, 11 Apr 2012 03:51:03 +0000 (13:51 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 03:51:03 +0000 (13:51 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 03:51:03 +0000 (13:51 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge
diff --cc drivers/regulator/tps65910-regulator.c
Simple merge
diff --cc drivers/video/au1100fb.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 11 Apr 2012 03:51:03 +0000 (13:51 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 11 Apr 2012 03:51:03 +0000 (13:51 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/regulator/tps65910-regulator.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/au1100fb.c	patch \|	diff1 \|	diff2 \|	blob \| history