| commit | 55871bdd03bf577c5c8fc65498ae24b7c148e1eb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 11 11:34:14 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 11 11:34:14 2009 -0800 |
| tree | 4e5e0a751e3229835200b4be69f6c71f94c31ece | |
| 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