tree 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab
parent 9a57f7fabd383920585ed8b74eacd117c6551f2d
parent 7f0f598a0069d1ab072375965a4b69137233169c
author David S. Miller <davem@davemloft.net> 1227080303 -0800
committer David S. Miller <davem@davemloft.net> 1227080303 -0800

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

Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c