| commit | 938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Sat Mar 26 10:03:03 2011 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sat Mar 26 10:03:03 2011 +0000 |
| tree | 9257bdba52ce88ca0a0c2f6fce1f59a1eb278452 | |
| parent | 16c29dafcc86024048f1dbb8349d31cb22c7c55a [diff] | |
| parent | 5898eb79fb45d4fd4ce22139c168de937bfaab38 [diff] |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable Conflicts: arch/arm/mach-pxa/tosa.c