tree 36fdd29537e43bbb4f36252e010a591ae6fe20bc
parent 1253332f75f3774cc84d0b7693152656848901f9
parent 0110d6f22f392f976e84ab49da1b42f85b64a3c5
author David S. Miller <davem@davemloft.net> 1271246493 -0700
committer David S. Miller <davem@davemloft.net> 1271246493 -0700

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

Conflicts:
	drivers/net/pcmcia/smc91c92_cs.c
	drivers/net/virtio_net.c