tree 167e974268f2979ffe7215755014d7e197fe9d02
parent 448f2627c169092d2091a1be22feb6a7775f6201
parent 51e65257142a87fe46a1ce5c35c86c5baf012614
author John W. Linville <linville@tuxdriver.com> 1307730372 -0400
committer John W. Linville <linville@tuxdriver.com> 1307730372 -0400

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/rtlwifi/pci.c