From: Paul Mundt Date: Mon, 8 Aug 2011 04:45:28 +0000 (+0900) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... X-Git-Tag: v3.1-rc5~15^2~7 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=77c7ee51a062bb595c501ec098125a68999c20c3;p=linux.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest Conflicts: drivers/tty/serial/sh-sci.c Signed-off-by: Paul Mundt --- 77c7ee51a062bb595c501ec098125a68999c20c3