From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 Jul 2010 03:12:06 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v2.6.35-rc4~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=62fd98571727a22ef77f1a9c1637260ad5a10baa;p=~emulex%2Finfiniband.git

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core:
  MAINTAINERS: Add an entry for i7core_edac
  i7core_edac: Avoid doing multiple probes for the same card
  i7core_edac: Properly discover the first QPI device
---

62fd98571727a22ef77f1a9c1637260ad5a10baa