Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Jul 2009 17:51:55 +0000 (10:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Jul 2009 17:51:55 +0000 (10:51 -0700)
* '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


Trivial merge