From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Jun 2012 20:17:12 +0000 (+0300)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6ddb99043cac53e30a38d68fe0835c901fbbbeb5;p=linux-beck.git

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

Pull m68k update from Geert Uytterhoeven.

This makes m68k use the generic library functions for the user-space
strn[cpy|len] functions.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Use generic strncpy_from_user(), strlen_user(), and strnlen_user()
---

6ddb99043cac53e30a38d68fe0835c901fbbbeb5