Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commits)
  [media] rc: update for bitop name changes
  fs: simplify iget & friends
  fs: pull inode->i_lock up out of writeback_single_inode
  fs: rename inode_lock to inode_hash_lock
  fs: move i_wb_list out from under inode_lock
  fs: move i_sb_list out from under inode_lock
  fs: remove inode_lock from iput_final and prune_icache
  fs: Lock the inode LRU list separately
  fs: factor inode disposal
  fs: protect inode->i_state with inode->i_lock
  lib, arch: add filter argument to show_mem and fix private implementations
  SLUB: Write to per cpu data when allocating it
  slub: Fix debugobjects with lockless fastpath
  autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd()
  autofs4 - remove autofs4_lock
  autofs4 - fix d_manage() return on rcu-walk
  autofs4 - fix autofs4_expire_indirect() traversal
  autofs4 - fix dentry leak in autofs4_expire_direct()
  autofs4 - reinstate last used update on access
  vfs - check non-mountpoint dentry might block in __follow_mount_rcu()
  ...

NOTE!

This merge commit was created to fix compilation error. The block
tree was merged upstream and removed the 'elv_queue_empty()'
function which the new 'mtdswap' driver is using. So a simple
merge of the mtd tree with upstream does not compile. And the
mtd tree has already be published, so re-basing it is not an option.

To fix this unfortunate situation, I had to merge upstream into the
mtd-2.6.git tree without committing, put the fixup patch on top of
this, and then commit this. The result is that we do not have commits
which do not compile.

In other words, this merge commit "merges" 3 things: the MTD tree, the
upstream tree, and the fixup patch.

1 files changed, 41 insertions, 4 deletions

diff --git a/arch/arm/mach-mxs/include/mach/mx28.h b/arch/arm/mach-mxs/include/mach/mx28.h
index 0716745267ad..75d86118b76a 100644
--- a/arch/arm/mach-mxs/include/mach/mx28.h
+++ b/arch/arm/mach-mxs/include/mach/mx28.h
@@ -163,10 +163,10 @@
 #define MX28_INT_USB0                   93
 #define MX28_INT_USB1_WAKEUP            94
 #define MX28_INT_USB0_WAKEUP            95
-#define MX28_INT_SSP0                   96
-#define MX28_INT_SSP1                   97
-#define MX28_INT_SSP2                   98
-#define MX28_INT_SSP3                   99
+#define MX28_INT_SSP0_ERROR             96
+#define MX28_INT_SSP1_ERROR             97
+#define MX28_INT_SSP2_ERROR             98
+#define MX28_INT_SSP3_ERROR             99
 #define MX28_INT_ENET_SWI               100
 #define MX28_INT_ENET_MAC0              101
 #define MX28_INT_ENET_MAC1              102
@@ -185,4 +185,41 @@
 #define MX28_INT_GPIO1                  126
 #define MX28_INT_GPIO0                  127
 
+/*
+ * APBH DMA
+ */
+#define MX28_DMA_SSP0                   0
+#define MX28_DMA_SSP1                   1
+#define MX28_DMA_SSP2                   2
+#define MX28_DMA_SSP3                   3
+#define MX28_DMA_GPMI0                  4
+#define MX28_DMA_GPMI1                  5
+#define MX28_DMA_GPMI2                  6
+#define MX28_DMA_GPMI3                  7
+#define MX28_DMA_GPMI4                  8
+#define MX28_DMA_GPMI5                  9
+#define MX28_DMA_GPMI6                  10
+#define MX28_DMA_GPMI7                  11
+#define MX28_DMA_HSADC                  12
+#define MX28_DMA_LCDIF                  13
+
+/*
+ * APBX DMA
+ */
+#define MX28_DMA_AUART4_RX              0
+#define MX28_DMA_AUART4_TX              1
+#define MX28_DMA_SPDIF_TX               2
+#define MX28_DMA_SAIF0                  4
+#define MX28_DMA_SAIF1                  5
+#define MX28_DMA_I2C0                   6
+#define MX28_DMA_I2C1                   7
+#define MX28_DMA_AUART0_RX              8
+#define MX28_DMA_AUART0_TX              9
+#define MX28_DMA_AUART1_RX              10
+#define MX28_DMA_AUART1_TX              11
+#define MX28_DMA_AUART2_RX              12
+#define MX28_DMA_AUART2_TX              13
+#define MX28_DMA_AUART3_RX              14
+#define MX28_DMA_AUART3_TX              15
+
 #endif /* __MACH_MX28_H__ */