diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 21:01:59 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 21:01:59 +0200 |
| commit | 02d6112cd7d75bf30685ee4b2e9dc0291b4d3133 (patch) | |
| tree | b1715624dadae286cac16deb5a634a33f4a46aa6 /kernel | |
| parent | FRV: Fix linkage problems (diff) | |
| parent | [MIPS] User stack pointer randomisation (diff) | |
| download | linux-02d6112cd7d75bf30685ee4b2e9dc0291b4d3133.tar.xz linux-02d6112cd7d75bf30685ee4b2e9dc0291b4d3133.zip | |
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] User stack pointer randomisation
[MIPS] Remove unused include/asm-mips/gfx.h
[MIPS] Remove unused include/asm-mips/ds1216.h
[MIPS] Workaround for RM7000 WAIT instruction aka erratum 38
[MIPS] Make support for weakly ordered LL/SC a config option.
[MIPS] Disable UserLocal runtime detection on platforms which never have it.
[MIPS] Disable MT runtime detection on platforms which never support MT.
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions