From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 May 2013 16:23:23 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: v3.10-rc4~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c48dd49646f156158c1a96ec637b9f987f517fe;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/geert/linux-m68k

Pull m68k fixes from Geert Uytterhoeven:
 - futex support that I had missed before,
 - A long-overdue update of the m68k defconfigs.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Update defconfigs for v3.9
  m68k: implement futex.h to support userspace robust futexes and PI mutexes
---

3c48dd49646f156158c1a96ec637b9f987f517fe