summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/dvm/dev.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 00:09:03 +0200
committerMark Brown <broonie@kernel.org>2015-04-12 00:09:03 +0200
commitf9de73426c69ec3357c31a10af5f5acb037dbbaa (patch)
treeb4fa15ca5962c3cc7546c61b4c98c79a08662478 /drivers/net/wireless/iwlwifi/dvm/dev.h
parentMerge remote-tracking branch 'spi/topic/img-spfi' into spi-next (diff)
parentspi: atmel: use endian agnostic IO (diff)
parentspi: introduce master->handle_err() callback (diff)
parentspi: bcm2835: enabling polling mode for transfers shorter than 30us (diff)
parentspi: bcm53xx: use msecs_to_jiffies for conversion (diff)
parentspi: bitbang: only toggle bitchanges (diff)
downloadlinux-f9de73426c69ec3357c31a10af5f5acb037dbbaa.tar.xz
linux-f9de73426c69ec3357c31a10af5f5acb037dbbaa.zip
Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2385', 'spi/topic/bcm2835', 'spi/topic/bcm53xx' and 'spi/topic/bitbang' into spi-next