tree f3227002f3cc0169566f5c34291b86f876bb676c
parent 6a16dda86ebbcfe690c753c3fb469b4f9ad5a5ef
parent b24f670b7f5b2058b95370caa9f104b3cefb9f1d
author Linus Torvalds <torvalds@linux-foundation.org> 1428959907 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1428959907 -0700

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

Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization
  m68k/pci: Remove a superflous KERN_ERR
  m68k/defconfig: Update defconfigs for v4.0-rc1
  m68k/q40: Make NE2000 builtin instead of modular
  m68k: Remove FSF address