diff options
| author | Vinod Koul <[email protected]> | 2017-11-14 05:06:09 +0000 |
|---|---|---|
| committer | Vinod Koul <[email protected]> | 2017-11-14 05:06:09 +0000 |
| commit | 135ab7f53cfb77bd0b215b68eed006c7825ea01e (patch) | |
| tree | 64ecce9f31a7b88f16851d9deaf04af0d8611205 /net/unix/af_unix.c | |
| parent | Merge branch 'topic/stm' into for-linus (diff) | |
| parent | dmaengine: sprd: Add Spreadtrum DMA driver (diff) | |
| download | kernel-135ab7f53cfb77bd0b215b68eed006c7825ea01e.tar.gz kernel-135ab7f53cfb77bd0b215b68eed006c7825ea01e.zip | |
Merge branch 'topic/sprd' into for-linus
Kconfig and Makefile conflicts so put them in right order (sprd ones after
stm ones)
Signed-off-by: Vinod Koul <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions