Merge tag 'v3.12'

Linux 3.12

Conflicts:
	fs/exec.c

1 files changed, 4 insertions, 0 deletions

diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h
index 6a293b7fff3b..cea9f70133c5 100644
--- a/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@ -71,6 +71,10 @@ struct atmel_nand_data {
         u8              on_flash_bbt;           /* bbt on flash */
         struct mtd_partition *parts;
         unsigned int    num_parts;
+        bool            has_dma;                /* support dma transfer */
+
+        /* default is false, only for at32ap7000 chip is true */
+        bool            need_reset_workaround;
 };
 
  /* Serial */