diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:40:29 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:40:29 +0100 |
| commit | 895e4e3a7da0fea246e736dd815b4d04851ea387 (patch) | |
| tree | 5fd0137d292400d83fed427cf98c1b1d31ef2ffe /net/unix/sysctl_net_unix.c | |
| parent | 0ddd80856b7b99cab198a09ed6cc9edb794fdb3e (diff) | |
| parent | a1d53dab4f5b37c800d7a20c56e84a96180a8ea6 (diff) | |
Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge
Marvell XOR driver DT changes for 3.8
Conflicts:
arch/arm/boot/dts/armada-xp.dtsi
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions