commit 7125764c5d1a5c72d522f1011b6cc8b8100b48fe
author Linus Torvalds <torvalds@linux-foundation.org> Wed Apr 02 12:51:41 2014 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Apr 02 12:51:41 2014 -0700
tree 678f3355ac872a4379b28dbe36f5beddd0e284d8
parent c6f21243ce1e8d81ad8361da4d2eaa5947b667c4
parent dce44e03b0a3448ad11ac6c6e0cbe299e0400791

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull compat time conversion changes from Peter Anvin:
 "Despite the branch name this is really neither an x86 nor an
  x32-specific patchset, although it the implementation of the
  discussions that followed the x32 security hole a few months ago.

  This removes get/put_compat_timespec/val() and replaces them with
  compat_get/put_timespec/val() which are savvy as to the current status
  of COMPAT_USE_64BIT_TIME.

  It removes several unused and/or incorrect/misleading functions (like
  compat_put_timeval_convert which doesn't in fact do any conversion)
  and also replaces several open-coded implementations what is now
  called compat_convert_timespec() with that function"

* 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  compat: Fix sparse address space warnings
  compat: Get rid of (get|put)_compat_time(val|spec)