diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-19 23:10:40 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-19 23:10:40 +0000 |
| commit | 7d83f8fca517b123cf0136503a9e50974f65ec49 (patch) | |
| tree | 92ed1faaf112e98e29a00efc99e1a4e6c79e6a8e /arch/m68k/apollo | |
| parent | be093beb608edf821b45fe00a8a080fb5c6ed4af (diff) | |
| parent | 569106c70e49ad67c69fa7d43a2a5218e63a4619 (diff) | |
Merge branch 'master' of git://git.marvell.com/orion into devel
Conflicts:
arch/arm/mach-mx1/devices.c
Diffstat (limited to 'arch/m68k/apollo')
0 files changed, 0 insertions, 0 deletions