From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 1 Mar 2008 00:54:33 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.25-rc4~127
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d395991c117d43bfca97101a931a41d062a93852;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] wrap kmap_atomic(KM_IRQ0) with local_irq_save/restore()
  sata_svw: Add support for HT1100 SATA controller
---

d395991c117d43bfca97101a931a41d062a93852