diff options
author | Kevin Hilman <khilman@linaro.org> | 2014-01-14 16:17:41 -0800 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2014-01-14 16:17:57 -0800 |
commit | c01c80d71c139c9799e255f18fa42fb7a3857634 (patch) | |
tree | 48a1194674524a04d47711e4b025460b45ff6c1d /net/unix/sysctl_net_unix.c | |
parent | 69f8fa9bfdf93810c5d29fe36e31018a136c37c2 (diff) | |
parent | 672ef909e9b10933dc676c87d1bdeaabfcc11dda (diff) |
Merge tag 'socfpga-dt-for-3.14' of git://git.rocketboards.org/linux-socfpga-next into next/dt
From Dinh Nguyen:
SOCFPGA DT updates for v3.14
* tag 'socfpga-dt-for-3.14' of git://git.rocketboards.org/linux-socfpga-next:
ARM: dts: socfpga: add pl330 clock
ARM: dts: socfpga: update L2 tag and data latency
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions