]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3e382dd 97b8b16)
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Feb 2014 20:19:06 +0000 (12:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Feb 2014 20:19:06 +0000 (12:19 -0800)
commitd94d0e273eecf3a348c2aab1cad79c2ac4b926be
treec935b271e409041be7c617e364d81ce3d052f073tree
parent3e382dd9d01d34b8770c0959abe52f4210ae237bcommit | diff
parent97b8b16bfcb7f5ccc1b3c10c08580f9f1acb61accommit | diff
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
Ubuntu combined Linux kernel mirror