diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 22:20:18 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 22:20:18 +0100 |
commit | 56012808f4d5606e401539f663d92009d964425b (patch) | |
tree | f3736a97725647393a2db7c95462d857115197ca /drivers/serial/s3c2400.c | |
parent | Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into dev... (diff) | |
parent | [ARM] orion5x: D-link DNS-323 revision A1 power LED (diff) | |
download | linux-56012808f4d5606e401539f663d92009d964425b.tar.xz linux-56012808f4d5606e401539f663d92009d964425b.zip |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'drivers/serial/s3c2400.c')
0 files changed, 0 insertions, 0 deletions