tree 0b0118c028b5de70ba42d45f18b08cd7cea96dad
parent 404504470177d5ca1b46db5197ee0b78d639a2eb
parent 67c8931677090540e31b4f816e5fe315ff51f262
author Linus Torvalds <torvalds@linux-foundation.org> 1278299526 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1278299526 -0700

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