summaryrefslogtreecommitdiffstats
path: root/include/dt-bindings
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2014-05-22 17:36:07 +0200
committerNicolas Ferre <nicolas.ferre@atmel.com>2014-05-22 17:36:07 +0200
commitd82b40133f2a7d50e491cecb64e4ea01dabd8672 (patch)
tree5d5e468bee175a0ef1403e07df7bb09f08dba2db /include/dt-bindings
parent89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd (diff)
parent35d35aae817706800a4913711d563a99e1dc380a (diff)
downloadlinux-stable-d82b40133f2a7d50e491cecb64e4ea01dabd8672.tar.gz
linux-stable-d82b40133f2a7d50e491cecb64e4ea01dabd8672.tar.bz2
linux-stable-d82b40133f2a7d50e491cecb64e4ea01dabd8672.zip
Merge branch 'at91-3.15-fixes' into at91-3.16-dt3
Diffstat (limited to 'include/dt-bindings')
-rw-r--r--include/dt-bindings/clock/at91.h (renamed from include/dt-bindings/clk/at91.h)0
1 files changed, 0 insertions, 0 deletions
diff --git a/include/dt-bindings/clk/at91.h b/include/dt-bindings/clock/at91.h
index 0b4cb999a3f7..0b4cb999a3f7 100644
--- a/include/dt-bindings/clk/at91.h
+++ b/include/dt-bindings/clock/at91.h