tree b4e9e56dbde79fe7185cba511a1ffd85f5d2018e
parent 344e0f623cec5eba273db06fe57db080988d6b26
parent 7a17a33c0da37f8d24222c967550d19dabf13617
author David S. Miller <davem@davemloft.net> 1279919018 -0700
committer David S. Miller <davem@davemloft.net> 1279919018 -0700

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h