tree b5f0e79e24449ff3284bc5f2f8d3aed041fda108
parent efb064dec6e35618ddc04f3ba49f70e528fbe069
parent b37fa870c7ccb500c7bf6aabc72cefa757da9791
author David S. Miller <davem@davemloft.net> 1253748226 -0700
committer David S. Miller <davem@davemloft.net> 1253748226 -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-rx.c