git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	Mark Brown <broonie@kernel.org>
	Tue, 7 Apr 2015 10:54:40 +0000 (11:54 +0100)
committer	Mark Brown <broonie@kernel.org>
	Tue, 7 Apr 2015 10:54:40 +0000 (11:54 +0100)
commit	63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa
tree	34150d2e7ac4eb6c00f4bc96991947f71a338a0d	tree \| snapshot (tar.gz zip)
parent	95bf15f386417f3ba80bb860c1385b1ebfdcdffa	commit \| diff
parent	e689d6df8257f92abf59e93736632b79c9b2aa66	commit \| diff

Merge branch 'fix/fsl-dspi' of git://git./linux/kernel/git/broonie/spi into spi-fsl-dspi

Conflicts:
drivers/spi/spi-fsl-dspi.c