diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 16:00:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 16:00:26 -0700 |
| commit | 2f66b529d9d131971e2509aee5478c61ca258ece (patch) | |
| tree | 7a670d9eb76839ed5eecbe0cc1c1c25ba7ba446c /fs | |
| parent | 1e66239e23dd0422baf891bf6af0b65ac632b676 (diff) | |
| parent | cdcc9eb5e014a58aba047193a73a0de8b61b988d (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix marge error due to conflict in arch/mips/kernel/head.S
[MIPS] ARC: Remove unused arch/mips/arc/console.c
[MIPS] SNI: sniprom
[MIPS] Jazz: remove unneeded reset functions
[MIPS] Whitespace cleanup.
[MIPS] Make resources for ds1742 "static __initdata"
[MIPS] Replace __attribute_used__ with __used
[MIPS] Jazz: Remove unused arch/mips/jazz/io.c
[MIPS] Mark prom_free_prom_memory as __init_refok
[MIPS] MIPSsim: Fix cflags
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions