summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-11-14 15:15:31 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-14 15:15:31 -0800
commitdc791d479802a784836a236d4a77a5325be545c4 (patch)
treef9f931bb37f31e30c67b4121c4743fca9dc12e22 /kernel
parentcd2579d7aa7bfc966cc271a88e77f8cfc3b0b7ba (diff)
parent253b92ecbd3d2e9f5a79fc7632c89ac74bff16c4 (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