| commit | 6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7 | [log] [tgz] |
|---|---|---|
| author | Rob Herring <robh@kernel.org> | Tue May 20 14:22:54 2014 -0500 |
| committer | Rob Herring <robh@kernel.org> | Tue May 20 14:22:54 2014 -0500 |
| tree | e01eaf5fcfed6767da9fcfd8f5120ef667c81bb8 | |
| parent | eafd370dfe487facfdef499057f4eac9aa0b4bf5 [diff] | |
| parent | e26f1db9b8d74617519e50b41749900d0a257406 [diff] |
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty into for-next Conflicts: arch/arm64/kernel/early_printk.c