diff options
| author |  Russell King <rmk@dyn-67.arm.linux.org.uk>
| 2009-06-14 11:01:44 +0100 |
|---|---|---|
| committer |  Russell King <rmk+kernel@arm.linux.org.uk>
| 2009-06-14 11:01:44 +0100 |
| commit | b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc (patch) | |
| tree | c65b81ef9ae5076d2137034accfa2610f45a13de /MAINTAINERS | |
| parent | Merge branch 'stmp' into devel (diff) | |
| parent | [ARM] 5535/1: U300 Makefile.boot (diff) | |
| download | linux-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.tar.gz linux-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.tar.bz2 linux-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.zip | |
Merge branch 'u300' into devel
Conflicts:
arch/arm/Makefile
Updates:
arch/arm/mach-u300/core.c
arch/arm/mach-u300/timer.c
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions