Merge branch 'for-3.8/wifi' into for-next

diff --cc arch/arm/boot/dts/tegra20-seaboard.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra20-ventana.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra30-cardhu.dtsi
Simple merge

diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
Simple merge

diff --cc arch/arm/mach-tegra/board-dt-tegra30.c
Simple merge