From: Greg Kroah-Hartman Date: Mon, 16 Jul 2012 19:32:42 +0000 (-0700) Subject: Merge branch 'v3.6-rc7' into tty-next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=467a3ca5cab64a16b5ec46ebb1895c84c280dcfe;p=linux-beck.git Merge branch 'v3.6-rc7' into tty-next This is to sync up on Linus's branch to get the other tty and core changes. Signed-off-by: Greg Kroah-Hartman --- 467a3ca5cab64a16b5ec46ebb1895c84c280dcfe