review.tizen.org Git - platform/kernel/linux-3.10.git/commit

author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Tue, 7 Oct 2008 18:06:22 +0000 (19:06 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 7 Oct 2008 18:06:22 +0000 (19:06 +0100)
commit	35437b6192d9a4eb92f095dfd72396b6d2970f0b
tree	2da81a1ac61620a7b91cf9ab0453b84bda8e71ce	tree \| snapshot
parent	922613436ae562a2903698f3a6e16998382a549d	commit \| diff
parent	f3ec5cc92a43c8ace8326c990e2ffc409893d809	commit \| diff
parent	d8ad7859e2044ecae26c4810b8a8c3d17afca0ca	commit \| diff
parent	a55facae05da311e05ea47b463fc430169812747	commit \| diff
parent	eda6f6ecbbd6bea070ca296e40c2117d80117b76	commit \| diff
parent	49ea26d0a0fa8eebc4bf0432ec3ad35a35202615	commit \| diff
parent	a461a8d2dff84ab027dd77f04e0d79f95931ef8f	commit \| diff
parent	ec36b16d0d1ae0a43eb8c395e9bf58efdadad1d7	commit \| diff

Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac', 'pxa-mp900', 'pxa-zylonite' and 'pxa-zaurus' into pxa-machines

Conflicts:

arch/arm/mach-pxa/poodle.c

MAINTAINERS	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
arch/arm/mach-pxa/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
arch/arm/mach-pxa/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history