summaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-05 06:41:10 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-05 06:41:10 -1000
commit5fdb32472ec6cd1d62788d8872585b342b5d1d92 (patch)
tree02fa80c65f4a8cf61724594c5181246da0c48945 /include/trace
parent140d0b2108faebc77c6523296e211e509cb9f5f9 (diff)
parent0302899e144296d6ce8cb3679a9a42d5c6436910 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide: drivers/ide/cy82c693.c: Add missing pci_dev_put ide: Fix irq flags madness
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions