| commit | 285eba57db7bd7d7c3c5929fb8621fdcaaea1b00 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Mon Jul 05 15:46:08 2010 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Mon Jul 05 15:46:08 2010 +0900 |
| tree | a9e7f0563cef296b24c53b20dbb388ec5c210172 | |
| parent | 1c14e6cecb1811543b1016f27e5d308fbea8c08a [diff] | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: include/linux/serial_sci.h Signed-off-by: Paul Mundt <lethal@linux-sh.org>