tree e5c37962611bc5f39c56a1ec479b9059072f056a
parent 09488e2e0fab14ebe41135f0d066cfe2c56ba9e5
parent 29fe1b481283a1bada994a69f65736db4ae6f35f
author David S. Miller <davem@davemloft.net> 1240484904 -0700
committer David S. Miller <davem@davemloft.net> 1240484904 -0700

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

Conflicts:
	net/iucv/af_iucv.c