Greg Kroah-Hartman 00fda1682e Merge 4.1-rc7 into tty-next ... This fixes up a merge issue with the amba-pl011.c driver, and we want the fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2015-06-08 10:49:28 -07:00
..
asm	Merge 4.1-rc7 into tty-next	2015-06-08 10:49:28 -07:00
uapi/asm	alpha: Wire up all missing implemented syscalls	2015-05-26 10:01:50 -07:00