From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 15 Jan 2008 21:49:09 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.24-rc8~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0938e7586440ac97cedc0f5528a8684ebfa4ce43;p=linux-2.6-omap-h63xx.git

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: correct handling of TSS DVD
  [libata] core checkpatch fix
  [libata] pata_bf54x: checkpatch fixes
  libata fixes for sparse-found problems
---

0938e7586440ac97cedc0f5528a8684ebfa4ce43