Merge branch 'for-linus' into next

Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.
This commit is contained in:
Dmitry Torokhov
2016-07-19 11:02:56 -07:00
10007 changed files with 508889 additions and 249758 deletions

View File

@@ -1014,7 +1014,7 @@ static int input_bits_to_string(char *buf, int buf_size,
{
int len = 0;
if (INPUT_COMPAT_TEST) {
if (in_compat_syscall()) {
u32 dword = bits >> 32;
if (dword || !skip_empty)
len += snprintf(buf, buf_size, "%x ", dword);