Merge tag 'please-pull-aertracefix' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 May 2013 21:47:04 +0000 (06:47 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 May 2013 21:47:04 +0000 (06:47 +0900)
commit977b55cf988b86cdc929fef730a78aca98a8ebdb
tree90f2c6b53356f453cfe337e7888bd1c6d859741f
parentfe696b47eb061f47559ce7394d517cfb85af50f5
parent37448adfc7ce0d6d5892b87aa8d57edde4126f49
Merge tag 'please-pull-aertracefix' of git://git./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