tree bb92a46fb9fe75ee9c4fdbbe0a5b6eafc6818ef3
parent 8ae2e12f1534e647d4a816755e5a09c2de6f9fca
parent 34459512ffa7236c849466e3bd604801389734e1
author John W. Linville <linville@tuxdriver.com> 1310410019 -0400
committer John W. Linville <linville@tuxdriver.com> 1310410019 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
	drivers/net/wireless/ath/ath5k/sysfs.c
	net/bluetooth/l2cap_core.c
	net/mac80211/wpa.c