Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/x86...
authorJesse Barnes <jbarnes@hobbes.lan>
Thu, 12 Jun 2008 20:51:05 +0000 (13:51 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Thu, 12 Jun 2008 20:51:05 +0000 (13:51 -0700)

Trivial merge