| commit | 00cd25b29ba946b7d0907157577ab5cf421bd50e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 08 13:55:39 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 08 13:55:39 2010 -0800 |
| tree | 57d76cf7a495ea8f1ac662e12442bf6164ea3024 | |
| parent | e2b6d02cca533715d6be40fdfc32d3cc47333358 [diff] | |
| parent | b49bfd32901625e4adcfee011d2b32a43b4db67d [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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