tree 3bb599e665ed7510df2e3f4c8cb008f7a33f50a9
parent 0670b8ae66daf1d326c7bd10e73daff5f18fcf92
parent 0302b8622ce696af1cda22fcf207d3793350e896
author David S. Miller <davem@davemloft.net> 1290201227 -0800
committer David S. Miller <davem@davemloft.net> 1290201227 -0800

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

Conflicts:
	drivers/net/bonding/bond_main.c
	net/core/net-sysfs.c
	net/ipv6/addrconf.c