aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2010-08-25 15:41:18 +0000
committerLinus Torvalds <[email protected]>2010-08-25 15:41:18 +0000
commit5a559057b4fa0f60b2772fb590bf13e90af7a57d (patch)
tree193391b65af88f56ffc440a37cac29f363e79a8c /net/unix/af_unix.c
parentMerge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parentMAINTAINERS: hwmon/coretemp: Change maintainers (diff)
downloadkernel-5a559057b4fa0f60b2772fb590bf13e90af7a57d.tar.gz
kernel-5a559057b4fa0f60b2772fb590bf13e90af7a57d.zip
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: MAINTAINERS: hwmon/coretemp: Change maintainers hwmon: (k8temp) Differentiate between AM2 and ASB1 hwmon: (ads7871) Fix ads7871_probe error paths hwmon: (coretemp) Fix harmless build warning
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions