Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[linux-2.6.git] / arch / x86 / include / asm / pci_32.h
2008-10-23 H. Peter Anvin x86: Fix ASM_X86__ header guards
2008-10-23 Al Viro x86, um: ... and asm-x86 move