summaryrefslogtreecommitdiffstats
path: root/include/linux/pci_ids.h
diff options
context:
space:
mode:
authorLinus Torvalds2013-07-24 04:43:55 +0200
committerLinus Torvalds2013-07-24 04:43:55 +0200
commit04012e3076943f17c8cfc77a196701c8f0b8964f (patch)
tree1f516b94814fd5a55abbaae6f64c295c592853bc /include/linux/pci_ids.h
parentMerge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux (diff)
parentEDAC: Fix lockdep splat (diff)
downloadkernel-qcow2-linux-04012e3076943f17c8cfc77a196701c8f0b8964f.tar.gz
kernel-qcow2-linux-04012e3076943f17c8cfc77a196701c8f0b8964f.tar.xz
kernel-qcow2-linux-04012e3076943f17c8cfc77a196701c8f0b8964f.zip
Merge tag 'please-pull-bp-edac' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC fix from Tony Luck: "Fix EDAC lockdep splat" * tag 'please-pull-bp-edac' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: EDAC: Fix lockdep splat
Diffstat (limited to 'include/linux/pci_ids.h')
0 files changed, 0 insertions, 0 deletions