tree 4e1ca325dde22f1ac21c9da0be509e87e922e604
parent c0f39322c335412339dec16ebfd2a05ceba5ebcf
parent 802fb176d8c635ae42da31b80841c26e8c7338a0
author David S. Miller <davem@davemloft.net> 1207200923 -0700
committer David S. Miller <davem@davemloft.net> 1207200923 -0700

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

Conflicts:

	drivers/net/s2io.c