From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Aug 2013 23:49:06 +0000 (-0700)
Subject: Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=359d16ca1bd6adcd9f031da35d807f9c37ec6a6e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'for-3.11' of git://git./linux/kernel/git/geert/linux-m68k

Pull m68k fixes from Geert Uytterhoeven:
 "These are two critical fixes, needed by distro kernels, and thus also
  destined for stable:

   - The do_div() commit fixes a crash in mounting btrfs volumes, which
     was a regression from 3.2,

   - The ARAnyM fix allows to have NatFeat drivers as loadable modules,
     which is needed for initrds"

* 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Truncate base in do_div()
  m68k/atari: ARAnyM - Fix NatFeat module support
---

359d16ca1bd6adcd9f031da35d807f9c37ec6a6e