tree b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5
parent 2c3c3d02f28801d7ad2da4952b2c7ca6621ef221
parent 72e2240f181871675d3a979766330c91d48a1673
author David S. Miller <davem@davemloft.net> 1236247607 -0800
committer David S. Miller <davem@davemloft.net> 1236247607 -0800

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

Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c