aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-29 19:54:33 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-29 19:54:33 -0500
commitd395991c117d43bfca97101a931a41d062a93852 (patch)
tree9c8300a5c24a41c4a3a22f2668158f7fc0899987 /kernel
parentb73384f06159d8388d7d17913b7e3a07e234c1ab (diff)
parentb445c56815d84b9fce40707f99811bdc354458e0 (diff)
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions