summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds2013-05-28 18:23:23 +0200
committerLinus Torvalds2013-05-28 18:23:23 +0200
commit3c48dd49646f156158c1a96ec637b9f987f517fe (patch)
treefd237f8d15074794e3268ce4d91bb2a16ed37ee0 /kernel
parentMerge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze (diff)
parentm68k: Update defconfigs for v3.9 (diff)
downloadkernel-qcow2-linux-3c48dd49646f156158c1a96ec637b9f987f517fe.tar.gz
kernel-qcow2-linux-3c48dd49646f156158c1a96ec637b9f987f517fe.tar.xz
kernel-qcow2-linux-3c48dd49646f156158c1a96ec637b9f987f517fe.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions