commit | 499ee0710f9881423d807c6ecc451c5e1bd5ff62 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 17 10:51:55 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 17 10:51:55 2009 -0700 |
tree | 27f94b3d81e7c3e5dbc97b7b1fa2d16257fc5af4 | |
parent | 8e3b3bb5e5ac064f83a8556100f10b7dfa1c719b [diff] | |
parent | 857fdc53a0a90c3ba7fcf5b1fb4c7a62ae03cf82 [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: insert ioapic resource before assigning unassigned resources