| commit | 499ee0710f9881423d807c6ecc451c5e1bd5ff62 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 17 Jul 2009 17:51:55 +0000 (17 10:51 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 17 Jul 2009 17:51:55 +0000 (17 10:51 -0700) | ||
| tree | 27f94b3d81e7c3e5dbc97b7b1fa2d16257fc5af4 | treesnapshot (tar.gz zip) |
| parent | 8e3b3bb5e5ac064f83a8556100f10b7dfa1c719b | commitdiff |
| parent | 857fdc53a0a90c3ba7fcf5b1fb4c7a62ae03cf82 | commitdiff |
Merge branch 'for-linus' of git://git./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: insert ioapic resource before assigning unassigned resources
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
x86/pci: insert ioapic resource before assigning unassigned resources