tree b7aa27b3e0c655f4613fe2146cb57d7f69e421f6
parent 875ec4333b99144e2589e900a0bcd2c25c757b27
parent 7775c9753b94fe429dc4323360d6502c95e0dd6e
author David S. Miller <davem@davemloft.net> 1213415559 -0700
committer David S. Miller <davem@davemloft.net> 1213415559 -0700

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

Conflicts:

	drivers/net/smc911x.c