| commit | bdf4e9482360a3ddc1619efbd5d1c928ede8c3fa | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Oct 25 08:19:59 2011 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Oct 25 08:19:59 2011 +0100 |
| tree | b02319e809c5b8abfca85409a11472775e27f597 | |
| parent | 06afb1a087d49ae0f676b2e5b9ffe5f4b3aba355 [diff] | |
| parent | eb0474544bc16a9dab53b26abd846e86ba814eb1 [diff] |
Merge branch 'misc' into for-linus Conflicts: arch/arm/mach-integrator/integrator_ap.c