]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel
authorMark Brown <broonie@linaro.org>
Wed, 16 Oct 2013 20:16:41 +0000 (21:16 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 16 Oct 2013 20:16:41 +0000 (21:16 +0100)
commitdd40cc536513545a4328b5621fb26ff0a5ab5239
tree7f9492cbbb93039ef84722e518e2ca6e8ad0c364
parent531f4df2470e1c790c4cca71faefaf28f9b83450
parentff83eb9b5c3878a9b8caaea8ceae3def4fe9146b
Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel

Conflicts (trivial overlapping cleanups):
drivers/spi/spi-atmel.c
drivers/spi/spi-atmel.c