linux-next: manual merge of the akpm tree with the spi tree

Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/spi/spi.c between commit 513273538a6c ("spi: Make max_tx and max_rx the same type") from the spi tree and commit "drivers/spi/spi.c: fix max() warning" from the akpm tree. I fixed it up (I used the version from the

linux-next: manual merge of the akpm tree with the spi tree

Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/spi/spi.c between commit 513273538a6c (spi: Make max_tx and max_rx the same type) from the spi tree and commit drivers/spi/spi.c: fix max() warning from the akpm tree. I fixed it up (I used the version from the akpm