diff options
author | Paul Mackerras <paulus@samba.org> | 2008-10-31 11:34:56 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-10-31 11:34:56 +0100 |
commit | bfb99f8258b5981ef7a2ec8099db56317ea16695 (patch) | |
tree | 2449e0968a1a14fe519475bfa29a5c4e3a60e23d /arch/powerpc/include/asm/pci.h | |
parent | powerpc: Fix compile errors with CONFIG_BUG=n (diff) | |
parent | powerpc: Remove duplicate DMA entry from mpc8313erdb device tree (diff) | |
download | linux-bfb99f8258b5981ef7a2ec8099db56317ea16695.tar.xz linux-bfb99f8258b5981ef7a2ec8099db56317ea16695.zip |
Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/include/asm/pci.h')
0 files changed, 0 insertions, 0 deletions