Merge tag 'spi-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

[pandora-kernel.git] / drivers / spi / spi-omap-100k.c

diff --cc drivers/spi/spi-omap-100k.c
Simple merge