Zhang Sanshan a8758dc110 Merge remote-tracking branch 'fsl-linux-sdk/imx_4.1.y' into aosp android-4.1 ...

Conflicts:
	drivers/mmc/core/core.c
	drivers/usb/gadget/configfs.c

2015-12-16 12:30:09 +08: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 remote-tracking branch 'fsl-linux-sdk/imx_4.1.y' into aosp android-4.1

2015-12-16 12:30:09 +08:00