From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 May 2013 21:47:04 +0000 (+0900)
Subject: Merge tag 'please-pull-aertracefix' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.10-rc4~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=977b55cf988b86cdc929fef730a78aca98a8ebdb;p=~emulex%2Finfiniband.git

Merge tag 'please-pull-aertracefix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

Pull aer error logging fix from Tony Luck:
 "Can't call pci_get_domain_bus_and_slot() from interupt context"

* tag 'please-pull-aertracefix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  aerdrv: Move cper_print_aer() call out of interrupt context
---

977b55cf988b86cdc929fef730a78aca98a8ebdb