diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-04-26 11:29:30 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-04-26 11:29:30 +0200 |
| commit | 12e8e5952598714faa6f202ab028bcd291337cce (patch) | |
| tree | bba92ecf29110bd779888aa21d6270866651a2e4 /include | |
| parent | 76e7745e8e4330fdb30f049303d524261c0b7a2c (diff) | |
| parent | 35d35aae817706800a4913711d563a99e1dc380a (diff) | |
| download | linux-12e8e5952598714faa6f202ab028bcd291337cce.tar.gz linux-12e8e5952598714faa6f202ab028bcd291337cce.tar.bz2 linux-12e8e5952598714faa6f202ab028bcd291337cce.zip | |
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
3.15 fixes for AT91
- one little DT fix
- the use of proper directory for clock in include/dt-bindings
it allows to remove the now empty include/dt-bindings/clk
* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
dt-bindings: clock: Move at91.h to dt-bindigs/clock
ARM: at91: fix spi cs on sama5d3 Xplained board
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include')
| -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 |