summaryrefslogtreecommitdiffstats
path: root/kernel/params.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-11 11:37:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-11 11:37:55 -0700
commit4d727a781f6c9ab8b446d6596ed2dcd6ce80bb47 (patch)
tree47f4ce9874ea5e47b14d379f57575c67e533030e /kernel/params.c
parent49641f1acfdfd437ed9b0a70b86bf36626c02afe (diff)
parent3c1e3896344063273715b332b1c0534deb9b286c (diff)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata-acpi: don't call sleeping function from invalid context Added Targa Visionary 1000 IDE adapter to pata_sis.c libata-acpi: filter out DIPM enable
Diffstat (limited to 'kernel/params.c')
0 files changed, 0 insertions, 0 deletions