From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Mar 2010 20:49:29 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88... 
X-Git-Tag: v2.6.34-rc2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=352d4657b23fbd329efccc396000a549e0150907;p=~emulex%2Finfiniband.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
  alpha: fix compile errors in dma-mapping-common.h
  alpha: remove trailing spaces in messages
  alpha: use __ratelimit
---

352d4657b23fbd329efccc396000a549e0150907