diff options
| author | Linus Torvalds <[email protected]> | 2009-11-11 19:34:14 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-11-11 19:34:14 +0000 |
| commit | 55871bdd03bf577c5c8fc65498ae24b7c148e1eb (patch) | |
| tree | 4e5e0a751e3229835200b4be69f6c71f94c31ece /fs/proc/array.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | x86/PCI: Adjust GFP mask handling for coherent allocations (diff) | |
| download | kernel-55871bdd03bf577c5c8fc65498ae24b7c148e1eb.tar.gz kernel-55871bdd03bf577c5c8fc65498ae24b7c148e1eb.zip | |
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 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions