Linux 3.4.9

Change-Id: I3396e916fa93b9ee27f7e908e6867f2b84af9662
Signed-off-by: Willi Ye <williye97@gmail.com>

Conflicts:
	net/wireless/reg.c