tree 218970ece71df99f686b9416b7fd88b921690ebb
parent d250fe91ae129bff0968e685cc9c466d3a5e3482
parent 9459d59fbf0bc82ff4c804679fa8bc22788eca63
author John W. Linville <linville@tuxdriver.com> 1273602295 -0400
committer John W. Linville <linville@tuxdriver.com> 1273602295 -0400

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

Conflicts:
	drivers/net/wireless/ath/ar9170/main.c