]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 1 Mar 2008 00:54:33 +0000 (16:54 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 1 Mar 2008 00:54:33 +0000 (16:54 -0800)
* '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


Trivial merge