diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-06 09:48:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-06 09:48:31 -0700 |
| commit | c87985a3ce723995fc7b25e598238d67154108a1 (patch) | |
| tree | e60def1b77c25c1d74180f62e8a5603f9826f209 /drivers/ssb/scan.c | |
| parent | d155255a344c417acad74156654295a2964e6b81 (diff) | |
| parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff) | |
Merge tty-next into 3.6-rc1
This handles the merge issue in:
arch/um/drivers/line.c
arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ssb/scan.c')
| -rw-r--r-- | drivers/ssb/scan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c index 266c7c5c86d..ab4627cf111 100644 --- a/drivers/ssb/scan.c +++ b/drivers/ssb/scan.c @@ -90,6 +90,8 @@ const char *ssb_core_name(u16 coreid) return "ARM 1176"; case SSB_DEV_ARM_7TDMI: return "ARM 7TDMI"; + case SSB_DEV_ARM_CM3: + return "ARM Cortex M3"; } return "UNKNOWN"; } |