From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 24 Feb 2011 19:36:31 +0000 (-0800)
Subject: Merge 2.6.38-rc6 into tty-next
X-Git-Tag: v2.6.39-rc1~470^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f227e08b71b9c273eaa29a57370a3a5b833aa382;p=pandora-kernel.git

Merge 2.6.38-rc6 into tty-next

This was to resolve a merge issue with drivers/char/Makefile and
drivers/tty/serial/68328serial.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

f227e08b71b9c273eaa29a57370a3a5b833aa382
Reading git-diff-tree failed