From: Linus Torvalds 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: firefly_0821_release~3680^2~387 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=977b55cf988b86cdc929fef730a78aca98a8ebdb;p=firefly-linux-kernel-4.4.55.git 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 --- 977b55cf988b86cdc929fef730a78aca98a8ebdb