From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 5 Jul 2010 06:46:08 +0000 (+0900)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.36-rc1~102^2^2^2~1^2~16
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=285eba57db7bd7d7c3c5929fb8621fdcaaea1b00;p=cascardo%2Flinux.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
	include/linux/serial_sci.h

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

285eba57db7bd7d7c3c5929fb8621fdcaaea1b00