diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-14 18:15:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-14 18:15:31 -0500 |
commit | dc791d479802a784836a236d4a77a5325be545c4 (patch) | |
tree | f9f931bb37f31e30c67b4121c4743fca9dc12e22 /kernel | |
parent | cd2579d7aa7bfc966cc271a88e77f8cfc3b0b7ba (diff) | |
parent | 253b92ecbd3d2e9f5a79fc7632c89ac74bff16c4 (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:
libata: fix double-completion on error
[PATCH] pata_artop: fix "& (1 >>" typo
[PATCH] hpt37x: Check the enablebits
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions