git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 7 Oct 2013 00:28:16 +0000 (17:28 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 7 Oct 2013 00:28:16 +0000 (17:28 -0700)
commit	97a7729a5c2f01faa076f38a7ec010961b456823
tree	d1aaecf81d1357b5920579347e6bb894b4bfe11c	tree \| snapshot (tar.gz zip)
parent	9987f76ad286887978803ece6cdcf34582279a29	commit \| diff
parent	d0e639c9e06d44e713170031fe05fb60ebe680af	commit \| diff

Merge 3.12-rc4 into tty-next

We want the tty fixes in this branch as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>