summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2014-07-19 00:58:34 +0400
committerJason Cooper <jason@lakedaemon.net>2014-07-19 00:58:34 +0400
commitf0cf9d2facbe3aa93b302058c013729cbc1bca22 (patch)
tree272bdf38e50d723fc88ef1fa068582087b6b8b27 /Documentation/devicetree/bindings
parent20c0c607605244dd237707bb07e7f2ffd82e8aa5 (diff)
parent6704d12d688192366f3a70e6f8a85cb5a869cd5a (diff)
downloadlinux-f0cf9d2facbe3aa93b302058c013729cbc1bca22.tar.xz
Merge branch 'irqchip/atmel-aic' into irqchip/core
Topic branch set up to facilitate merging the rest of the series which removes the driver from arch code.
Diffstat (limited to 'Documentation/devicetree/bindings')
-rw-r--r--Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt (renamed from Documentation/devicetree/bindings/arm/atmel-aic.txt)0
1 files changed, 0 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/atmel-aic.txt b/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt
index 2742e9cfd6b1..2742e9cfd6b1 100644
--- a/Documentation/devicetree/bindings/arm/atmel-aic.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt