diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-29 13:19:25 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-29 13:19:25 -0800 |
| commit | aa1ed457aee209d445dc2ac65c535eb7e232c788 (patch) | |
| tree | 434236f31f74d9e6ea33300b783674b8f9b2c7c2 /net/unix/sysctl_net_unix.c | |
| parent | 8761f3b3f0484485bc304b5c3a23afe30cfddd84 (diff) | |
| parent | bd0609896eabe2e64b75d7955ae5ecec528cf860 (diff) | |
Merge tag 'renesas-dt2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
From Simon Horman:
Second Round of Renesas ARM Based SoC DT Updates for v3.13
* r8a7791 (R-Car M2) based Koelsch board
- Add GPIO keys
* sh73a0 (SH-Mobile AG5) based kzm9g board
- Add FSI support
* tag 'renesas-dt2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: koelsch: dts: Add gpio-keys device
ARM: shmobile: kzm9g: add FSI support for DTS
ARM: shmobile: sh73a0: add FSI support via DTSI
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions