Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

diff --cc arch/arm/mach-tegra/Makefile
Simple merge

diff --cc arch/arm/mach-tegra/include/mach/iomap.h
index 766b590a1be79bdd64432b27d8be3e3a876d8749,26f2363a8b3b981e6f659151ef6b9492437840e2..e8f5e1c0ae314f9787fad3350c55f177208884e3
--- 1/arch/arm/mach-tegra/include/mach/iomap.h
--- 2/arch/arm/mach-tegra/include/mach/iomap.h
+++ b/arch/arm/mach-tegra/include/mach/iomap.h
@@@ -62,23 -62,17 +62,23 @@@
  #define TEGRA_RES_SEMA_BASE           0x60001000
  #define TEGRA_RES_SEMA_SIZE           SZ_4K
  
 +#define TEGRA_ARB_SEMA_BASE           0x60002000
 +#define TEGRA_ARB_SEMA_SIZE           SZ_4K
 +
  #define TEGRA_PRIMARY_ICTLR_BASE      0x60004000
- #define TEGRA_PRIMARY_ICTLR_SIZE      SZ_64
+ #define TEGRA_PRIMARY_ICTLR_SIZE      64
  
 +#define TEGRA_ARBGNT_ICTLR_BASE               0x60004040
 +#define TEGRA_ARBGNT_ICTLR_SIZE               192
 +
  #define TEGRA_SECONDARY_ICTLR_BASE    0x60004100
- #define TEGRA_SECONDARY_ICTLR_SIZE    SZ_64
+ #define TEGRA_SECONDARY_ICTLR_SIZE    64
  
  #define TEGRA_TERTIARY_ICTLR_BASE     0x60004200
- #define TEGRA_TERTIARY_ICTLR_SIZE     SZ_64
+ #define TEGRA_TERTIARY_ICTLR_SIZE     64
  
  #define TEGRA_QUATERNARY_ICTLR_BASE   0x60004300
- #define TEGRA_QUATERNARY_ICTLR_SIZE   SZ_64
+ #define TEGRA_QUATERNARY_ICTLR_SIZE   64
  
  #define TEGRA_TMR1_BASE                       0x60005000
  #define TEGRA_TMR1_SIZE                       8