From: Linus Torvalds Date: Mon, 20 Jan 2014 23:12:49 +0000 (-0800) Subject: Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v3.14-rc1~154 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=15c81026204da897a05424c79263aea861a782cc;p=karo-tx-linux.git 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 --- 15c81026204da897a05424c79263aea861a782cc