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

author Stephen Warren <swarren@nvidia.com>

Mon, 15 Oct 2012 19:12:57 +0000 (13:12 -0600)

committer Stephen Warren <swarren@nvidia.com>

Mon, 15 Oct 2012 19:12:57 +0000 (13:12 -0600)
author Stephen Warren <swarren@nvidia.com>
Mon, 15 Oct 2012 19:12:57 +0000 (13:12 -0600)
committer Stephen Warren <swarren@nvidia.com>
Mon, 15 Oct 2012 19:12:57 +0000 (13:12 -0600)
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
author	Stephen Warren <swarren@nvidia.com>
	Mon, 15 Oct 2012 19:12:57 +0000 (13:12 -0600)
committer	Stephen Warren <swarren@nvidia.com>
	Mon, 15 Oct 2012 19:12:57 +0000 (13:12 -0600)
		1	2
arch/arm/boot/dts/tegra20-seaboard.dts	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/tegra20-ventana.dts	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/tegra30-cardhu.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-dt-tegra20.c	patch \|	diff1 \|	diff2 \|	blob \| history