| commit | 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jan 06 22:33:32 2011 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jan 06 22:33:32 2011 +0000 |
| tree | 99119edc53fdca73ed7586829b8ee736e09440b3 | |
| parent | 28cdac6690cb113856293bf79b40de33dbd8f974 [diff] | |
| parent | 1051b9f0f9eab8091fe3bf98320741adf36b4cfa [diff] |
Merge branch 'devel-stable' into devel Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h