diff options
| author |   Tony Lindgren <tony@atomide.com> | 2015-04-01 12:24:29 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-04-01 12:24:29 -0700 |
| commit | 21295368367beaa563b310d5492166dba158b884 (patch) | |
| tree | c8a7c44beff93c040c76788ce2f6f4916281cbd8 /net/unix/af_unix.c | |
| parent | ARM: DRA7: Enable Cortex A15 errata 798181 (diff) | |
| parent | ARM: OMAP4+: control: add support for initializing control module via DT (diff) | |
| download | wireguard-linux-21295368367beaa563b310d5492166dba158b884.tar.xz wireguard-linux-21295368367beaa563b310d5492166dba158b884.zip | |
Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into omap-for-v4.1/prcm-cleanup
Conflicts:
arch/arm/boot/dts/dra7.dtsi
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions