aboutsummaryrefslogtreecommitdiffstats
path: root/net/switchdev/switchdev.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <[email protected]>2015-02-28 15:19:27 +0000
committerGreg Kroah-Hartman <[email protected]>2015-02-28 15:19:27 +0000
commitc18fafc89c38251f4ddabfa2c9e0be90169c0e59 (patch)
tree305958bff8b88983e8ce71fa8a11edfa3b40a19a /net/switchdev/switchdev.c
parentMerge tag 'iio-fixes-for-4.0a' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentiio: ak8975: fix AK09911 dependencies (diff)
downloadkernel-c18fafc89c38251f4ddabfa2c9e0be90169c0e59.tar.gz
kernel-c18fafc89c38251f4ddabfa2c9e0be90169c0e59.zip
Merge tag 'iio-fixes-for-4.0b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes: Second round of IIO fixes for the 4.0 cycle (or round one part two really!) These are fixes for patches in the recent merge window and are in a separate branch to avoid rebasing the main fixes-togreg branch. * jsa1212 - select missing REGMAP_I2C * ssp_common - build warning fix for PM functions when PM not in use. * ak8975 - the addition of a utility library for this driver (as part of adding new device support) led to a dependency not being inforced for the original driver (I2C and GPIOLIB).
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions