From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 26 Nov 2010 10:28:11 +0000 (+0000)
Subject: Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable
X-Git-Tag: v2.6.38-rc1~471^2^2~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=83cf1eecfe9afee99d6b86f963187acd414c019d;p=~emulex%2Finfiniband.git

Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable
---

83cf1eecfe9afee99d6b86f963187acd414c019d