diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-06 17:36:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-06 17:36:31 +0200 |
| commit | ab195c58b864802c15e494f06ae109413e12d50b (patch) | |
| tree | 7b86a6c2a673323b0a90cae227f9fc023eb5b3ff /drivers/hid/hid-ntrig.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | libata: unlock HPA if device shrunk (diff) | |
| download | linux-ab195c58b864802c15e494f06ae109413e12d50b.tar.xz 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/hid-ntrig.c')
0 files changed, 0 insertions, 0 deletions