summaryrefslogtreecommitdiffstats
path: root/drivers/pci/quirks.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-12-07 21:48:15 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-12-07 21:48:15 +0100
commit34161db6b14d984fb9b06c735b7b42f8803f6851 (patch)
tree99656278b6697f1cde5b05894b7c0ee22c63a00e /drivers/pci/quirks.c
parentSUNRPC: Remove pprintk() from net/sunrpc/xprt.c (diff)
parent[PATCH] A few small additions and corrections to README (diff)
downloadlinux-34161db6b14d984fb9b06c735b7b42f8803f6851.tar.xz
linux-34161db6b14d984fb9b06c735b7b42f8803f6851.zip
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Conflicts: include/linux/sunrpc/xprt.h net/sunrpc/xprtsock.c Fix up conflicts with the workqueue changes.
Diffstat (limited to 'drivers/pci/quirks.c')
0 files changed, 0 insertions, 0 deletions