tree 1e8ee5c8f14e0e57965eca81bc6725288fd3597b
parent 4cebb34caa5122216a1e2451eae9e0fc47ec2589
parent d89197c7f34934fbb0f96d938a0d6cfe0b8bcb1c
author John W. Linville <linville@tuxdriver.com> 1291322797 -0500
committer John W. Linville <linville@tuxdriver.com> 1291322797 -0500

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

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