Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jun 2012 20:17:12 +0000 (23:17 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jun 2012 20:17:12 +0000 (23:17 +0300)
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()


Trivial merge