diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-25 09:19:59 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-25 09:19:59 +0200 |
| commit | bdf4e9482360a3ddc1619efbd5d1c928ede8c3fa (patch) | |
| tree | b02319e809c5b8abfca85409a11472775e27f597 /arch/arm/mach-dove/include | |
| parent | Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v... (diff) | |
| parent | ARM: 7133/1: SMP: fix per cpu timer setup before the cpu is marked online (diff) | |
| download | linux-bdf4e9482360a3ddc1619efbd5d1c928ede8c3fa.tar.xz linux-bdf4e9482360a3ddc1619efbd5d1c928ede8c3fa.zip | |
Merge branch 'misc' into for-linus
Conflicts:
arch/arm/mach-integrator/integrator_ap.c
Diffstat (limited to 'arch/arm/mach-dove/include')
0 files changed, 0 insertions, 0 deletions