summaryrefslogtreecommitdiff
path: root/drivers/irqchip/irqchip.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2014-05-20 23:22:54 +0400
committerRob Herring <robh@kernel.org>2014-05-20 23:22:54 +0400
commit6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7 (patch)
treee01eaf5fcfed6767da9fcfd8f5120ef667c81bb8 /drivers/irqchip/irqchip.c
parenteafd370dfe487facfdef499057f4eac9aa0b4bf5 (diff)
parente26f1db9b8d74617519e50b41749900d0a257406 (diff)
downloadlinux-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