黄涛 ee25a425b9 lsk 14.05 android release ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJThhtPAAoJELSic+t+oim9fZ4P/jAn9ODwGqk/EhH6GOzo98G7 mRvxwBvP+ZjR4sFeBt7opDKMfqnLul89K3MEXFriBrvlRrJD+cCPscosEOdxsdjH dtLYgIZa1xE4uACs+kSjWG5mwfKIcE9PPFw8LtPy17GBHDwVcVMYcXevy5capFMD eNydfhr4YdjzXsEXTygTLwj5PHEddSYWP8smUhEz9xfEC37UDdla4lxIIgkhHL4N Six9BivH+V1gm7TfiKYspCm1SCgWS4GessKNXSxBCvG0yyfFjfVBSI8fQnmCr3rJ ID5xWgFpLDaIFbEwsRwBkjsbJRrobTdYW4hI6h9y2TPBQVlyqm/sFjKxAfWRvm+N rqVHZWEpbShFPptCYPYt5m+Jz5nd0bN5Bp+uh7UOhNK0oPL9+Y+fJBhCfE9r8PtW qFbabDkClEUBdXuqQSoM0Iwo8do0k+WVk0wS2MKr4YW2iHT3GzT2+BC6mBhIJiES 1vjK6sN1HmzAGYTdmqzozTx+e7AHi2ibgpBlCp8WBtxjS4/cgc8Mbl+Gj5iIbj8f 7zgeOUKdUr/OpAx497wHA2vIHQ8N3+7+VJxnrt9QqtUICpInAKdTNW8Na5RNHKeU fd2fSsmAqjY85uCcanx2+XfJeUfKSoYXpz1xR4uTQEHggHCNoV/1zSni5Zg4bpc6 YfKEvDhP7JRzYt/H6U7p =vZ08 -----END PGP SIGNATURE----- Merge tag 'lsk-android-14.05' into develop-3.10 lsk 14.05 android release Conflicts: arch/arm/common/Kconfig arch/arm64/include/asm/arch_timer.h drivers/staging/android/fiq_debugger/fiq_debugger.c drivers/usb/Kconfig		2014-06-12 21:04:26 +08:00
..
hvc	drivers/tty/hvc: don't free hvc_console_setup after init	2014-05-13 13:59:40 +02:00
ipwireless
serial	lsk 14.05 android release	2014-06-12 21:04:26 +08:00
vt	vt: Fix secure clear screen	2014-02-22 12:41:27 -08:00
amiserial.c	rk: revert 20f3d0b+v3.0.66 to v3.0	2013-11-08 21:34:05 +08:00
bfin_jtag_comm.c
cyclades.c
ehv_bytechan.c	TTY: ehv_bytechan: add missing platform_driver_unregister() when module exit	2013-05-20 12:15:59 -07:00
goldfish.c
isicom.c
Kconfig
Makefile
metag_da.c
moxa.c	rk: revert 20f3d0b+v3.0.66 to v3.0	2013-11-08 21:34:05 +08:00
moxa.h
mxser.c	tty: mxser: Fix build warning introduced by dfc7b837c7 (Re: linux-next: build warning after merge of the tty.current tree)	2013-05-22 10:26:02 -07:00
mxser.h
n_gsm.c	tty: n_gsm: Fix for modems with brk in modem status control	2014-02-22 12:41:27 -08:00
n_hdlc.c
n_r3964.c
n_tracerouter.c
n_tracesink.c
n_tracesink.h
n_tty.c	n_tty: Fix n_tty_write crash when echoing in raw mode	2014-05-13 13:59:40 +02:00
nozomi.c
pty.c	rk: revert 20f3d0b+v3.0.66 to v3.0	2013-11-08 21:34:05 +08:00
rocket.c	TTY: rocket, fix more no-PCI warnings	2013-05-20 12:15:59 -07:00
rocket.h
rocket_int.h
synclink.c
synclink_gt.c
synclinkmp.c
sysrq.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2013-05-01 13:20:04 -07:00
tty_audit.c	audit: do not needlessly take a lock in tty_audit_exit	2013-04-30 15:31:28 -04:00
tty_buffer.c
tty_io.c	tty: Set correct tty name in 'active' sysfs attribute	2014-04-26 17:15:34 -07:00
tty_ioctl.c	tty: Fix SIGTTOU not sent with tcflush()	2013-10-05 07:13:10 -07:00
tty_ldisc.c	rk: revert 20f3d0b+v3.0.66 to v3.0	2013-11-08 21:34:05 +08:00
tty_mutex.c
tty_port.c	rk: revert 20f3d0b+v3.0.66 to v3.0	2013-11-08 21:34:05 +08:00