aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2010-08-28 21:24:49 +0000
committerLinus Torvalds <[email protected]>2010-08-28 21:24:49 +0000
commit303fd2c2ce5addef1aacac962a5b099cc0af71ea (patch)
treea20d906caec25a068742d6d9998baf79e5c72677 /net/unix/af_unix.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff)
parentBlackfin: bf52x/bf54x boards: drop unused nand page size (diff)
downloadkernel-303fd2c2ce5addef1aacac962a5b099cc0af71ea.tar.gz
kernel-303fd2c2ce5addef1aacac962a5b099cc0af71ea.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: Blackfin: bf52x/bf54x boards: drop unused nand page size Blackfin: punt duplicate SPORT MMR defines
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions