tree cb4e957b0c03494f4e0cc6a3f0f468e4b608dbf1
parent a4531edd75522804dd2b268d8ccc5eaa70748011
parent cdb9b9f730eac4f947a2c552806a3a550bf019ef
author Linus Torvalds <torvalds@g5.osdl.org> 1126304220 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1126304220 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6