tree 85efc4a76dc356593d6d394776aeb845dc580fb6
parent cbd9da7be869f676afc204e1a664163778c770bd
parent 053d8f6622701f849fda2ca2c9ae596c13599ba9
author David S. Miller <davem@davemloft.net> 1284096453 -0700
committer David S. Miller <davem@davemloft.net> 1284096453 -0700

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

Conflicts:
	net/mac80211/main.c