aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-16 08:21:17 +0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-16 08:21:17 +0700
commita9bdddb8dd711d70c5e0068fd8ad5ae5f4419359 (patch)
treef896eac7b042a60246fb0c200b465eeca1d60411 /fs
parentMerge branch 'akpm' (incoming from Andrew) (diff)
parenti2c: Re-instate body of i2c_parent_is_i2c_adapter() (diff)
downloadlinux-dev-a9bdddb8dd711d70c5e0068fd8ad5ae5f4419359.tar.xz
linux-dev-a9bdddb8dd711d70c5e0068fd8ad5ae5f4419359.zip
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c bugfix from Wolfram Sang. * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: Re-instate body of i2c_parent_is_i2c_adapter()
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions