tree f759d90c46bfbc48a9f396c9c6f839da11cdc6aa
parent f44702f49056c203341badaa2cb8a706160d9119
parent a04ce0ffcaf561994ecf382cd3caad75556dc499
author Linus Torvalds <torvalds@g5.osdl.org> 1126220123 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1126220123 -0700

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