diff options
| author | Linus Torvalds <[email protected]> | 2012-03-13 05:53:37 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2012-03-13 05:53:37 +0000 |
| commit | 0ae5eaf1032ca3cd5a0097f72992fc4821c762fa (patch) | |
| tree | 9370e8fd969fa20fbb1b8e01f2095335f5787ade /lib/timerqueue.c | |
| parent | Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh (diff) | |
| parent | PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled (diff) | |
| download | kernel-0ae5eaf1032ca3cd5a0097f72992fc4821c762fa.tar.gz kernel-0ae5eaf1032ca3cd5a0097f72992fc4821c762fa.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
Pull PCI changes from Jesse Barnes:
"A single fix for a regression that affects some people who try to
disable ASPM for whatever reason."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:
PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled
Diffstat (limited to 'lib/timerqueue.c')
0 files changed, 0 insertions, 0 deletions