]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ae1a25d 432dc14)
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 7 Feb 2009 21:43:28 +0000 (21:43 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 7 Feb 2009 21:43:28 +0000 (21:43 +0000)
commite4cc8fca1c77905bce91b42a1372d4a73069a529
tree56897b891842ff3f52536c51dfc82a579e718713tree | snapshot
parentae1a25da8448271a99745da03100d5299575a269commit | diff
parent432dc14fa40dea427d9ed476965001a816ff833bcommit | diff
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

Conflicts:

arch/arm/configs/magician_defconfig
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/configs/em_x270_defconfig | diff2 | blob | history
arch/arm/configs/magician_defconfig diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.