aboutsummaryrefslogtreecommitdiffstats
path: root/net/switchdev/switchdev.c
diff options
context:
space:
mode:
authorMark Brown <[email protected]>2015-04-24 10:10:46 +0000
committerMark Brown <[email protected]>2015-04-24 10:10:46 +0000
commit5a1b11cbccda7680b6859a4648f7af16f30e79b4 (patch)
tree2ba1fee09e15a9be1f2e01c9fdc6aa547da00224 /net/switchdev/switchdev.c
parentMerge remote-tracking branch 'spi/fix/core' into spi-linus (diff)
parentspi: bcm2835: Add GPIOLIB dependency (diff)
parentspi: bcm2835: change timeout of polling driver to 1s (diff)
parentspi: bitbang: Make setup_transfer() callback optional (diff)
parentspi: fsl-spi: use devm_ioremap_resource() to map parameter ram on CPM1 (diff)
parentspi/omap2-mcpsi: Always call spi_finalize_current_message() (diff)
downloadkernel-5a1b11cbccda7680b6859a4648f7af16f30e79b4.tar.gz
kernel-5a1b11cbccda7680b6859a4648f7af16f30e79b4.zip
Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm2835-code', 'spi/fix/bitbang', 'spi/fix/fsl-cpm' and 'spi/fix/omap2-mcspi' into spi-linus