Skip to content
Commit 353c7815 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 

Conflicts:
	net/wireless/reg.c
parents 01925efd d0a361a5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment