Ingo Molnar edc2988c54 Merge branch 'linus' into locking/core, to fix up conflicts ... Conflicts: mm/page_alloc.c Signed-off-by: Ingo Molnar <mingo@kernel.org>		2017-09-04 11:01:18 +02:00
..
asm	Merge branch 'linus' into locking/core, to fix up conflicts	2017-09-04 11:01:18 +02:00
uapi/asm	tty: Fix TIOCGPTPEER ioctl definition	2017-07-17 17:04:41 +02:00