From: David S. Miller <davem@davemloft.net>
Date: Sat, 11 Feb 2012 04:32:28 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d5ef8a4d87ab21d575ac86366599c9152a28028d;p=~shefty%2Frdma-dev.git

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

Conflicts:
	drivers/infiniband/hw/nes/nes_cm.c

Simple whitespace conflict.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

d5ef8a4d87ab21d575ac86366599c9152a28028d