tree 4732fbdfc3bd40b5a2fd888bb741f42730e7c74d
parent 17af691cd19765b782d891fc50c1568d0f1276b3
parent 43a6b76050aa137c51d00eec91d67ac43ac3846e
author Linus Torvalds <torvalds@g5.osdl.org> 1120588558 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1120588558 -0700

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