From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Sep 2009 18:40:24 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.31~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4886b5b485ec78fe4a16fedaccfab39bdf55410f;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  gianfar: Fix build.
---

4886b5b485ec78fe4a16fedaccfab39bdf55410f