Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Nov 2014 22:09:33 +0000 (14:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Nov 2014 22:09:33 +0000 (14:09 -0800)
Pull m68k update from Geert Uytterhoeven.

Just wiring up the bpf system call.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Wire up bpf


Trivial merge