Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Jul 2010 03:12:06 +0000 (20:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Jul 2010 03:12:06 +0000 (20:12 -0700)
* '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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge