diff options
| author | Olof Johansson <olof@lixom.net> | 2014-11-05 01:44:53 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-11-05 01:44:53 +0300 |
| commit | a0f3e826e8a5084bec73433a36670c386ed3aefe (patch) | |
| tree | 645ff52d54665b040207aff49234edfb869018a5 /fs/dlm/dir.h | |
| parent | 1f2dd7bcbfbef9030aff449eccde1328408b70d1 (diff) | |
| parent | d5153cd734dd6c1243bb3dc98065be99b10d049f (diff) | |
| download | linux-a0f3e826e8a5084bec73433a36670c386ed3aefe.tar.xz | |
Merge tag 'renesas-dt-clocksource-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Merge "Renesas ARM Based SoC DT Clocksource Updates for v3.19" from Simon
Horman:
* sh_mtu2: Drop incorrect SoC family name
* sh_tmu: Document r8a7778 and r8a7740 bindings
* tag 'renesas-dt-clocksource-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
clocksource: sh_mtu2: Drop incorrect SoC family name
clocksource: sh_tmu: Document r8a7778 binding
clocksource: sh_tmu: Document R-Mobile r8a7740 binding
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/dlm/dir.h')
0 files changed, 0 insertions, 0 deletions