summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-03 14:20:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-03 14:20:44 -0700
commit126d4576cb73c8a440adc37c129589cd66051bcc (patch)
tree1e87f8ba2527d1eae2896b377da8c61b0e1d3b82 /net/socket.c
parent039001972a959ab31008a3924ff9519063371bc2 (diff)
parent86b59bbfae2a895aa26b3d15f31b1a705dbfede1 (diff)
downloadop-kernel-dev-126d4576cb73c8a440adc37c129589cd66051bcc.zip
op-kernel-dev-126d4576cb73c8a440adc37c129589cd66051bcc.tar.gz
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: "Two i2c driver bugfixes" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: qup: Fix order of runtime pm initialization i2c: rk3x: fix 0 length write transfers
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud