Merge 3.8 changes up to main-promo-2013.09.16-B1
Dan Willemsen [Thu, 19 Sep 2013 04:02:51 +0000 (21:02 -0700)]
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

1  2 
arch/arm/mach-tegra/board-ardbeg-sdhci.c
arch/arm/mach-tegra/board-ardbeg.c

Simple merge