tree 9958a6c33e29b5af5faccf6650e98729151618a2
parent c86ae82605ef92594a0de809a8c588ae955fed63
parent 7fefe6a88494b00b151b5ca7bb84daaa781bbca7
author David S. Miller <davem@davemloft.net> 1247800884 -0700
committer David S. Miller <davem@davemloft.net> 1247800884 -0700

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

Conflicts:
	drivers/net/wireless/orinoco/main.c