tree b05b9d18a1256d7ed97bdfb537213a8d70ccca57
parent 80c0531514516e43ae118ddf38424e06e5c3cb3c
parent 93b47684f60cf25e8cefe19a21d94aa0257fdf36
author Linus Torvalds <torvalds@g5.osdl.org> 1136860902 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1136860902 -0800

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