summaryrefslogtreecommitdiffstats
path: root/arch/um/include/asm/mmu.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 20:24:19 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 20:24:19 +0200
commit8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6 (patch)
treef846fcbf6b756b76834e06e412a8248bbfb55b32 /arch/um/include/asm/mmu.h
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff)
parentPCI: pci_slot: grab refcount on slot's bus (diff)
downloadlinux-8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6.tar.xz
linux-8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: pci_slot: grab refcount on slot's bus PCI Hotplug: acpiphp: grab refcount on p2p subordinate bus PCI: allow PCI core hotplug to remove PCI root bus PCI: Fix oops in pci_vpd_truncate PCI: don't corrupt enable_cnt when doing manual resource alignment PCI: annotate pci_rescan_bus as __ref, not __devinit PCI-IOV: fix missing kernel-doc PCI: Setup disabled bridges even if buses are added PCI: SR-IOV quirk for Intel 82576 NIC
Diffstat (limited to 'arch/um/include/asm/mmu.h')
0 files changed, 0 insertions, 0 deletions