From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 28 Sep 2012 19:41:56 +0000 (+0200)
Subject: Merge branch 'bcmring/cleanup' into bcmring/removal
X-Git-Url: https://git.openfabrics.org/?p=~shefty%2Frdma-dev.git;a=commitdiff_plain;h=25e4b485fb8eeda8aa7a2e1e45fbb31538565117

Merge branch 'bcmring/cleanup' into bcmring/removal

Doing a large-scale cleaning and removing the platform in another
branch don't mix well, so do the trivial merge here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

25e4b485fb8eeda8aa7a2e1e45fbb31538565117