Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/qspi', 'spi/topic/s3c24xx', 'spi/topic/s3c64xx', 'spi/topic/sh', 'spi/topic/tegra114', 'spi/topic/tegra20-sflash', 'spi/topic/tegra20-slink', 'spi/topic/txx9' and 'spi/topic/xcomm' into spi-linus - linux

diff options

author	Mark Brown <broonie@linaro.org>	2014-01-23 14:07:14 +0100
committer	Mark Brown <broonie@linaro.org>	2014-01-23 14:07:14 +0100
commit	8aeab58e560da02772d6018eb4d6923514476a04 (patch)
tree	645bef7e7e575cd57cc6eaf0406adced71fb3759 /security/keys/keyring.c
parent	Merge remote-tracking branches 'spi/topic/fsl-espi', 'spi/topic/gpio', 'spi/t... (diff)
parent	spi/pxa2xx: fix compilation warning when !CONFIG_PM_SLEEP (diff)
parent	spi: ti-qspi: Fixup driver name (diff)
parent	spi: s3c24xx: Remove reference to plat/fiq.h (diff)
parent	spi/s3c64xx: Correct indentation (diff)
parent	spi: sh: Use spi_sh_clear_bit() instead of open-coded (diff)
parent	spi: tegra114: use u32 for 32-bit register values (diff)
parent	spi: tegra20-sflash: use u32 for 32-bit register values (diff)
parent	spi: tegra20-slink: use u32 for 32-bit register values (diff)
parent	spi: txx9: drop clk_put for devm_clk_get in txx9spi_probe() (diff)
parent	spi: xcomm: Use devm_spi_register_master() (diff)
download	linux-8aeab58e560da02772d6018eb4d6923514476a04.tar.xz linux-8aeab58e560da02772d6018eb4d6923514476a04.zip

Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/qspi', 'spi/topic/s3c24xx', 'spi/topic/s3c64xx', 'spi/topic/sh', 'spi/topic/tegra114', 'spi/topic/tegra20-sflash', 'spi/topic/tegra20-slink', 'spi/topic/txx9' and 'spi/topic/xcomm' into spi-linus


context:
space:
mode: