| commit | e4cc8fca1c77905bce91b42a1372d4a73069a529 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Sat Feb 07 21:43:28 2009 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sat Feb 07 21:43:28 2009 +0000 |
| tree | 56897b891842ff3f52536c51dfc82a579e718713 | |
| parent | ae1a25da8448271a99745da03100d5299575a269 [diff] | |
| parent | 432dc14fa40dea427d9ed476965001a816ff833b [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