aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2015-04-27 00:44:09 +0000
committerLinus Torvalds <[email protected]>2015-04-27 00:44:09 +0000
commit85f2901bdf4bdc0d034e1bbe8629e269ec200389 (patch)
tree2dcf1d35bae18a7205e56a050ae87cf0053e76fa /net/unix/af_unix.c
parentMerge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parenti2c: st: add include for pinctrl (diff)
downloadkernel-85f2901bdf4bdc0d034e1bbe8629e269ec200389.tar.gz
kernel-85f2901bdf4bdc0d034e1bbe8629e269ec200389.zip
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: "This has a mixture of merge window cleanups and bugfixes" * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: st: add include for pinctrl i2c: mux: use proper dev when removing "channel-X" symlinks i2c: digicolor: remove duplicate include i2c: Mark adapter devices with pm_runtime_no_callbacks i2c: pca-platform: fix broken email address i2c: mxs: fix broken email address i2c: rk3x: report number of messages transmitted
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions