diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-22 17:21:06 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-22 17:21:06 -0500 |
| commit | f2edbadefd1a528f313da9027a4cf3ccf6f89ebf (patch) | |
| tree | 92a8e1dd21d8d1cc3d99e1cf9728dc6fbeaf1c37 /include/linux/nfs4.h | |
| parent | 2652fbde3f423112b0acd5e7f8ec75c31a04d752 (diff) | |
| parent | 45e5c2cb6bc1c52c7134f898ea326a422dd75761 (diff) | |
Merge tag 'at91-dt2' of git://github.com/at91linux/linux-at91 into next/dt
From Nicolas Ferre:
Second DT pull-request for 3.14
- now that PWM driver is on its way to mainline,
we can integrate the DT entries
- As an example, use PWM for at91sam9m10g45ek leds
- Addition of clock specification for newly introduced
crypto DT entries
* tag 'at91-dt2' of git://github.com/at91linux/linux-at91:
ARM: at91/dt: add clk properties to sama5d3 TDES device node
ARM: at91/dt: add clk properties to sama5d3 AES device node
ARM: at91/dt: add clk properties to sama5d3 SHA device node
ARM: at91: at91sam9m10g45ek: switch to PWM leds
ARM: at91: add PWM device node
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/nfs4.h')
0 files changed, 0 insertions, 0 deletions