From: Michal Marek <mmarek@suse.cz>
Date: Mon, 25 Feb 2013 20:50:05 +0000 (+0100)
Subject: Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
X-Git-Tag: v3.9-rc1~49^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e3900e74f26fc924c8e9e2a922bd40369b0bb517;p=~emulex%2Finfiniband.git

Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

There is one kconfig fix in the rc-fixes branch that I forgot to submit
for 3.8, so let's add it to the kconfig branch for 3.9-rc1.
---

e3900e74f26fc924c8e9e2a922bd40369b0bb517