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)
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


Trivial merge