tree ce0e81d7afe35120135f24510d7577bc6b8f25fd
parent c9cdd9a6ae49704f12a289706551536ec842693f
parent 79dbbc60493f357912d5f1da5a23147ba0c01c7a
author Linus Torvalds <torvalds@linux-foundation.org> 1390259569 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1390259569 -0800

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

Pull x32 uapi changes from Peter Anvin:
 "This is the first few of a set of patches by H.J.  Lu to make the
  kernel uapi headers usable for x32, as required by some non-glibc
  libcs.

  These particular patches make the stat and statfs structures usable"

* 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, x32: Use __kernel_long_t for __statfs_word
  x86, x32: Use __kernel_long_t/__kernel_ulong_t in x86-64 stat.h