From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Tue, 14 Nov 2006 23:15:31 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v3.12-rc1~31920^2~20^2~115
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc791d479802a784836a236d4a77a5325be545c4;p=kernel%2Fkernel-generic.git

Merge branch 'upstream-linus' of /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
---

dc791d479802a784836a236d4a77a5325be545c4