Merge remote-tracking branch 'fbdev/fbdev-next'

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

Mon, 5 Sep 2011 05:11:35 +0000 (15:11 +1000)

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

Mon, 5 Sep 2011 05:11:35 +0000 (15:11 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 05:11:35 +0000 (15:11 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 05:11:35 +0000 (15:11 +1000)
diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge
diff --cc drivers/video/atmel_lcdfb.c
Simple merge
diff --cc drivers/video/backlight/adp8870_bl.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 5 Sep 2011 05:11:35 +0000 (15:11 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 5 Sep 2011 05:11:35 +0000 (15:11 +1000)
		1	2
arch/arm/mach-shmobile/board-mackerel.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/atmel_lcdfb.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/adp8870_bl.c	patch \|	diff1 \|	diff2 \|	blob \| history