Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Dec 2014 21:04:59 +0000 (13:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Dec 2014 21:04:59 +0000 (13:04 -0800)
Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/mm: Eliminate memset after alloc_bootmem_pages
  nubus: Remove superfluous interrupt disable/restore


Trivial merge