From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Feb 2014 21:12:19 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~10765
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c378a6566392789dd7400b13e4d4064cbbb9a087;p=mirror_ubuntu-artful-kernel.git

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
---

c378a6566392789dd7400b13e4d4064cbbb9a087