projects / platform / kernel / linux-3.10.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9226134 f3ec5cc d8ad785 a55faca eda6f6e 49ea26d a461a8d ec36b16)
Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 7 Oct 2008 18:06:22 +0000 (19:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Oct 2008 18:06:22 +0000 (19:06 +0100)
Conflicts:

arch/arm/mach-pxa/poodle.c

1  2  3  4  5  6  7  8 
MAINTAINERS patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | blob | history
arch/arm/mach-pxa/Kconfig patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | blob | history
arch/arm/mach-pxa/Makefile patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-pxa/Kconfig
Simple merge
diff --cc arch/arm/mach-pxa/Makefile
Simple merge
Domain: System / Kernel;