summaryrefslogtreecommitdiffstats
path: root/drivers/net/ibmlana.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-18 10:37:48 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-18 10:37:48 +0100
commit95f3c4ebffb5f5dd6c06bf48a8e24c7247b5139c (patch)
tree4b2d80e82fb4fdcc0c0bde4292780c22392cd034 /drivers/net/ibmlana.c
parentMerge branch 'linus' into core/iommu (diff)
parentdma-debug/x86: register pci bus for dma-debug leak detection (diff)
downloadlinux-95f3c4ebffb5f5dd6c06bf48a8e24c7247b5139c.tar.xz
linux-95f3c4ebffb5f5dd6c06bf48a8e24c7247b5139c.zip
Merge branch 'dma-api/debug' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'drivers/net/ibmlana.c')
0 files changed, 0 insertions, 0 deletions