aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2011-11-24 01:26:22 +0000
committerLinus Torvalds <[email protected]>2011-11-24 01:26:22 +0000
commit8174a06eba10a43375d1dd6f74c58a71519e3be5 (patch)
tree2eb5b0ed96556527483ca0f62eec51b6720030c8 /net/unix/af_unix.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff)
parentlibata: fix build without BMDMA (diff)
downloadkernel-8174a06eba10a43375d1dd6f74c58a71519e3be5.tar.gz
kernel-8174a06eba10a43375d1dd6f74c58a71519e3be5.zip
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
* 'upstream-linus' of git://github.com/jgarzik/libata-dev: libata: fix build without BMDMA [libata] ahci_platform: fix DT probing
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions