Merge branch 'irqchip/sunxi' into irqchip/core

Browse source

...

This commit is contained in:

Jason Cooper 2015-12-23 16:09:07 +00:00

parent 86e57ca735 bbbb03c1a8

commit d8e81cbd80

3 changed files with 40 additions and 27 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

Documentation/devicetree/bindings/interrupt-controller/allwinner,sun67i-sc-nmi.txt → Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt

View file

13

drivers/irqchip/irq-sunxi-nmi.c

View file