From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 23 Apr 2012 16:39:23 +0000 (-0700)
Subject: Merge 3.4-rc4 into tty-next
X-Git-Tag: v3.5-rc1~146^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10af77c193681398e5dbe830db181d86047fcd41;p=pandora-kernel.git

Merge 3.4-rc4 into tty-next

This resolves the merge problem with:
	drivers/tty/serial/pch_uart.c

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

10af77c193681398e5dbe830db181d86047fcd41
Reading git-diff-tree failed