| commit | 77c7ee51a062bb595c501ec098125a68999c20c3 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Mon Aug 08 13:45:28 2011 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Mon Aug 08 13:45:28 2011 +0900 |
| tree | c5060ca5786ef353e005dae04b61d2c49967284d | |
| parent | 1ba762209491e2496e58baffa3fd65d661f54404 [diff] | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 [diff] |
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 <lethal@linux-sh.org>