diff options
author | Rob Herring <robh@kernel.org> | 2014-05-20 23:22:54 +0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-05-20 23:22:54 +0400 |
commit | 6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7 (patch) | |
tree | e01eaf5fcfed6767da9fcfd8f5120ef667c81bb8 /drivers/irqchip/irqchip.c | |
parent | eafd370dfe487facfdef499057f4eac9aa0b4bf5 (diff) | |
parent | e26f1db9b8d74617519e50b41749900d0a257406 (diff) | |
download | linux-6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7.tar.xz |
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
Diffstat (limited to 'drivers/irqchip/irqchip.c')
0 files changed, 0 insertions, 0 deletions