Merge commit 'v3.2-rc2' into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Mon, 21 Nov 2011 23:42:06 +0000 (23:42 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Mon, 21 Nov 2011 23:42:06 +0000 (23:42 +0000)
1  2 
arch/arm/mach-at91/board-cap9adk.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-sam9261ek.c
arch/arm/mach-at91/board-sam9263ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-sam9rlek.c
drivers/video/Kconfig
drivers/video/atmel_lcdfb.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge