diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:34:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:34:14 -0800 |
| commit | 55871bdd03bf577c5c8fc65498ae24b7c148e1eb (patch) | |
| tree | 4e5e0a751e3229835200b4be69f6c71f94c31ece /usr | |
| parent | e5d45abe1487aa856e48d6d9b857bd200b63b896 (diff) | |
| parent | eb647138acefc897c0eb6eddd5d3650966dfe627 (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:
x86/PCI: Adjust GFP mask handling for coherent allocations
PCI ASPM: fix oops on root port removal
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions