diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-07 12:19:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-07 12:19:06 -0800 |
| commit | d94d0e273eecf3a348c2aab1cad79c2ac4b926be (patch) | |
| tree | c935b271e409041be7c617e364d81ce3d052f073 /arch/mips/Makefile | |
| parent | 3e382dd9d01d34b8770c0959abe52f4210ae237b (diff) | |
| parent | 97b8b16bfcb7f5ccc1b3c10c08580f9f1acb61ac (diff) | |
| download | linux-d94d0e273eecf3a348c2aab1cad79c2ac4b926be.tar.gz | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
"hree minor patches. All have sat in -next for a few days"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: fpu.h: Fix build when CONFIG_BUG is not set
MIPS: Wire up sched_setattr/sched_getattr syscalls
MIPS: Alchemy: Fix DB1100 GPIO registration
Diffstat (limited to 'arch/mips/Makefile')
0 files changed, 0 insertions, 0 deletions