264 to 298 patch

Conflicts:
	arch/arm/mach-tegra/baseband-xmm-power.c
	arch/arm/mach-tegra/tegra3_clocks.c
	drivers/i2c/busses/i2c-tegra.c
	drivers/misc/Makefile
	drivers/net/usb/raw_ip_net.c
	drivers/net/wireless/bcmdhd/Makefile
	drivers/video/tegra/dc/mode.c
	include/linux/nl80211.h
	include/net/cfg80211.h
	net/mac80211/ieee80211_i.h
	net/mac80211/scan.c
	net/wireless/mlme.c
	net/wireless/nl80211.c
	net/wireless/nl80211.h