From: David S. Miller <davem@davemloft.net>
Date: Mon, 24 Mar 2008 05:54:03 +0000 (-0700)
Subject: Merge branch 'master' of ../net-2.6/
X-Git-Tag: v2.6.26-rc1~1138^2~377
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=06802a819a0a2d31c952c0624cea6cd00e4e50da;p=~shefty%2Frdma-dev.git

Merge branch 'master' of ../net-2.6/

Conflicts:

	net/ipv6/ndisc.c
---

06802a819a0a2d31c952c0624cea6cd00e4e50da