Merge Gavin patches from the PCI tree as subsequent powerpc
patches are going to depend on them
Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>