Merge commit 'v3.3' into fbdev-next

author Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

Tue, 20 Mar 2012 18:59:50 +0000 (18:59 +0000)

committer Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

Tue, 20 Mar 2012 18:59:50 +0000 (18:59 +0000)
author Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 20 Mar 2012 18:59:50 +0000 (18:59 +0000)
committer Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 20 Mar 2012 18:59:50 +0000 (18:59 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-shmobile/board-ag5evm.c
Simple merge
diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge
diff --cc arch/arm/mach-shmobile/board-bonito.c
Simple merge
diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge
author	Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
	Tue, 20 Mar 2012 18:59:50 +0000 (18:59 +0000)
committer	Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
	Tue, 20 Mar 2012 18:59:50 +0000 (18:59 +0000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ag5evm.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ap4evb.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-bonito.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-mackerel.c	patch \|	diff1 \|	diff2 \|	blob \| history