diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-12-19 07:33:57 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-19 07:34:39 -0800 |
| commit | 718133a63714fb6051fa44932375ffafb44114f3 (patch) | |
| tree | 0183dd901eed3e7a87aafac69d6b906f78d92a5a /net/unix/sysctl_net_unix.c | |
| parent | 1cfe0874c1f174de9aeadd4ce680c88a26e55547 (diff) | |
| parent | 69e18e26b5773092276a9702244784faf9b6c65f (diff) | |
Merge tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper:
mvebu DT changes for v3.14 (incr. #3)
- kirkwood
- use symbolic names for gpios and key inputs
- mvebu
- add the pxa nand controller to the ReadyNAS and A370-RD boards
* tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Enable NAND controller in A370 Reference Design board
ARM: mvebu: Enable NAND controller in ReadyNAS 2120 .dts file
ARM: mvebu: Enable NAND controller in ReadyNAS 104 .dts file
ARM: mvebu: Enable NAND controller in ReadyNAS 102 .dts file
ARM: DT: Kirkwood: Use symbolic names from gpio.h
ARM: DT: Kirkwood: Use symbolic names from input.h
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions