Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 1 insertions, 0 deletions

diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h
index 2ea20320c093..51948eb6927a 100644
--- a/include/linux/spi/ads7846.h
+++ b/include/linux/spi/ads7846.h
@@ -17,6 +17,7 @@ struct ads7846_platform_data {
         u16     vref_mv;                /* external vref value, milliVolts */
         bool    keep_vref_on;           /* set to keep vref on for differential
                                          * measurements as well */
+        bool    swap_xy;                /* swap x and y axes */
 
         /* Settling time of the analog signals; a function of Vcc and the
          * capacitance on the X/Y drivers.  If set to non-zero, two samples