Al Viro 237dae8890 Merge branch 'iocb' into for-davem ... trivial conflict in net/socket.c and non-trivial one in crypto - that one had evaded aio_complete() removal. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>		2015-04-09 00:01:38 -04:00
..
braille.c	printk: Fix return of braille_register_console()	2013-08-06 13:18:12 -07:00
braille.h	printk: move braille console support into separate braille.[ch] files	2013-07-31 14:41:03 -07:00
console_cmdline.h	console: Fix console name size mismatch	2015-03-07 03:39:55 +01:00
Makefile	printk: move braille console support into separate braille.[ch] files	2013-07-31 14:41:03 -07:00
printk.c	Merge branch 'iocb' into for-davem	2015-04-09 00:01:38 -04:00