]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Feb 2014 21:12:19 +0000 (13:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Feb 2014 21:12:19 +0000 (13:12 -0800)
commite99f23222feea078450f65eaa4cad3d6ebf523a8
tree030ba06ad3528f4ecac4550686dc11762292ec17
parentef2508361a10d1ecc813439e1b10df6392a561f7
parent489ac984969b689fd7a62d53328188c960684228
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k update from Geert Uytterhoeven:
  - More barrier.h consolidation
  - Sched_[gs]etattr() syscalls

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Wire up sched_setattr and sched_getattr
  m68k: Switch to asm-generic/barrier.h
  m68k: Sort arch/m68k/include/asm/Kbuild