tree 8416607b62ec352176c81afd6f4e7b571ceb957f
parent ecd4137320b59759bbe57eef89040ee3e5e66039
parent 61fa9dcf9329cb92c220f7b656410fbe5e72f933
author David S. Miller <davem@davemloft.net> 1237840504 -0700
committer David S. Miller <davem@davemloft.net> 1237840504 -0700

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

Conflicts:
	drivers/net/ucc_geth.c