summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds2010-04-06 17:36:31 +0200
committerLinus Torvalds2010-04-06 17:36:31 +0200
commitab195c58b864802c15e494f06ae109413e12d50b (patch)
tree7b86a6c2a673323b0a90cae227f9fc023eb5b3ff /drivers/hid/Kconfig
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentlibata: unlock HPA if device shrunk (diff)
downloadkernel-qcow2-linux-ab195c58b864802c15e494f06ae109413e12d50b.tar.gz
kernel-qcow2-linux-ab195c58b864802c15e494f06ae109413e12d50b.tar.xz
kernel-qcow2-linux-ab195c58b864802c15e494f06ae109413e12d50b.zip
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: unlock HPA if device shrunk libata: disable NCQ on Crucial C300 SSD libata: don't whine on spurious IRQ
Diffstat (limited to 'drivers/hid/Kconfig')
0 files changed, 0 insertions, 0 deletions