Merge remote-tracking branch 'spi/fix/grant' into spi-linus
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 May 2013 14:27:18 +0000 (18:27 +0400)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 May 2013 14:27:18 +0000 (18:27 +0400)
commit88b0357dde1c2721a64268e4601d1c2dec1158b0
treea86c0af317bbb3f501c4d5b3517b02640a9f69c0
parent0faa3146f17295f612abadafbfe3d4346178f10f
parent3086c9f6482101b3c06935cdfb4d4b56adb60097
Merge remote-tracking branch 'spi/fix/grant' into spi-linus
drivers/spi/spi-atmel.c
drivers/spi/spi-davinci.c
drivers/spi/spi.c
include/linux/spi/spi.h