diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 11:32:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 11:32:05 -0400 |
| commit | a6e995ad7409403c5bbd6fe8f666a280e086bb22 (patch) | |
| tree | 3fdf4ece186941719de154d4ab973a95d451fe5d /MAINTAINERS | |
| parent | 547ad5ac665234953e32678f6a32385b58edefc3 (diff) | |
| parent | 7e483865612568268773317219d07b38a8c4d62d (diff) | |
Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score
* 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score:
score: update email address in MAINTAINERS.
score: Cleanup linker script using new macros.
score: Make THREAD_SIZE available to assembly files.
score: Make PAGE_SIZE available to assembly.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d8973ca86f2a..ed6cd99a57ba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4465,7 +4465,7 @@ SCORE ARCHITECTURE | |||
| 4465 | P: Chen Liqin | 4465 | P: Chen Liqin |
| 4466 | M: liqin.chen@sunplusct.com | 4466 | M: liqin.chen@sunplusct.com |
| 4467 | P: Lennox Wu | 4467 | P: Lennox Wu |
| 4468 | M: lennox.wu@sunplusct.com | 4468 | M: lennox.wu@gmail.com |
| 4469 | W: http://www.sunplusct.com | 4469 | W: http://www.sunplusct.com |
| 4470 | S: Supported | 4470 | S: Supported |
| 4471 | 4471 | ||