Linux 3.4.9

Conflicts:

	net/wireless/reg.c