diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 21:20:18 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 21:20:18 +0000 |
| commit | 56012808f4d5606e401539f663d92009d964425b (patch) | |
| tree | f3736a97725647393a2db7c95462d857115197ca /arch/sh/kernel/sh_bios.c | |
| parent | a814290e17ae314bd614476cffc6119846eca27e (diff) | |
| parent | b2a731aa5cbca7e0252da75e16de7ae5feb1313a (diff) | |
| download | blackbird-op-linux-56012808f4d5606e401539f663d92009d964425b.tar.gz blackbird-op-linux-56012808f4d5606e401539f663d92009d964425b.zip | |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'arch/sh/kernel/sh_bios.c')
0 files changed, 0 insertions, 0 deletions
