From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Apr 2015 21:18:27 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: v4.1-rc1~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5142ef1cbda9a48ff87e9b944096767252204c6e;p=thirdparty%2Fkernel%2Fstable.git

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
---

5142ef1cbda9a48ff87e9b944096767252204c6e