aboutsummaryrefslogtreecommitdiff
path: root/include/linux/timerfd.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-23 18:56:21 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-23 18:56:21 -0700
commitc09b360a2b0779e08bacb88d3fcd8458ebc49658 (patch)
treef9b8ea6bf9fe3fc395ff9b46a865b9ee459e239a /include/linux/timerfd.h
parent432409eebcdec38ff6fa949f097b5438d588faa5 (diff)
parent3a9e3a51dd47bd9e2fd6bcf3c893eb5729c6f1ee (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: jmicron: update quirk for JMB361/3/5/6 libata: add HTS542525K9SA00 to NCQ blacklist libata-core: auditting chk_status v check_status [libata] checkpatch-inspired cleanups
Diffstat (limited to 'include/linux/timerfd.h')
0 files changed, 0 insertions, 0 deletions