projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6e7d43f 37c14e8)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 May 2013 16:23:23 +0000 (09:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 May 2013 16:23:23 +0000 (09:23 -0700)
commit3c48dd49646f156158c1a96ec637b9f987f517fe
treefd237f8d15074794e3268ce4d91bb2a16ed37ee0tree | snapshot
parent6e7d43f494463af3a5213a0a9fe5b9aa0f7856abcommit | diff
parent37c14e83ee173cc3f6310d80f00f2e588c402b61commit | diff
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
Domain: System / Kernel;