tree 6ac985658a06b0787e4354d0d16d380ea9b16a5a
parent ac178ef0ae9eb44fd527d87aa9b6394e05f56e1f
parent d2f8d7ee1a9b4650b4e43325b321801264f7c37a
author David S. Miller <davem@davemloft.net> 1234681920 -0800
committer David S. Miller <davem@davemloft.net> 1234681920 -0800

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c