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)
commit62fd98571727a22ef77f1a9c1637260ad5a10baa
tree0b0118c028b5de70ba42d45f18b08cd7cea96dad
parent404504470177d5ca1b46db5197ee0b78d639a2eb
parent67c8931677090540e31b4f816e5fe315ff51f262
Merge branch 'for_linus' of git://git./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
MAINTAINERS