From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jan 2010 21:55:39 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: 2.1b_release~9747
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00cd25b29ba946b7d0907157577ab5cf421bd50e;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCIe AER: prevent AER injection if hardware masks error reporting
  PCI/PM: Use per-device D3 delays
  PCI: Check the node argument passed to cpumask_of_node
  PCI: AER: fix aer inject result in kernel oops
  PCI: pcie portdrv: style cleanup
---

00cd25b29ba946b7d0907157577ab5cf421bd50e