tree 1ede9804ee33d7eefb73e9535e0399dfd7f58c00
parent f404c2fea37e02bec7c8b6edddf5edd22ca60505
parent f435d9eea01309aa7b6c1f134569a7b5957918ae
author David S. Miller <davem@davemloft.net> 1292003447 -0800
committer David S. Miller <davem@davemloft.net> 1292003447 -0800

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

Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c