f0e9e4d00b6cc8c79b05ca7815a5f
parent 908a7a16b852ffd618a9127be8d62432182d81b4
parent 739840d529eb7505d3cbfe9d468bf1440c9a8e27
author David S. Miller <davem@davemloft.net> 1230083783 -0800
committer David S. Miller <davem@davemloft.net> 1230083783 -0800

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

Conflicts:

	drivers/net/ppp_generic.c
w‰{'™'x