Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
	net/mac80211/iface.c
This commit is contained in:
John W. Linville 2010-01-05 17:18:59 -05:00
commit 4f9b2a7dea
18 changed files with 206 additions and 53 deletions