]> git.karo-electronics.de Git - karo-tx-linux.git/commit - include/acpi/acpixf.h
Merge remote-tracking branch 'spi/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:37:27 +0000 (14:37 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:37:27 +0000 (14:37 +0200)
commitef5bfcc8f2afb0fa3ee1a38a80bf1b16a9a0d01e
tree4f1f6fef47a208a31190fad35fef771a92358e98
parent90605becc7c6db45a84bb2d2a364db6e008f2a6e
parentf8ce25620cdce9bb71072c5480591607f8e828ac
Merge remote-tracking branch 'spi/for-next'

Conflicts:
drivers/spi/spi.c
Documentation/driver-model/devres.txt
drivers/spi/spi-fsl-cpm.c
drivers/spi/spi-fsl-espi.c
drivers/spi/spi-mpc512x-psc.c
drivers/spi/spi.c