aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-03 18:15:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-03 18:15:18 -0800
commitdc79d2f21a2dc19df26f0cb0b46be2d6241b627b (patch)
treeba6191124786698b8da63938c20638bf97c31464 /fs
parentb419148e567728f6af0c3b01965c1cc141e3e13a (diff)
parentf38e35b43f2924b3b4e51147b7193f32e9276db4 (diff)
downloadkernel_samsung_aries-dc79d2f21a2dc19df26f0cb0b46be2d6241b627b.zip
kernel_samsung_aries-dc79d2f21a2dc19df26f0cb0b46be2d6241b627b.tar.gz
kernel_samsung_aries-dc79d2f21a2dc19df26f0cb0b46be2d6241b627b.tar.bz2
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: sata_via: Remove redundant device ID for VIA VT8261 drivers/ata/libata: Move dereference after NULL test ahci: Enable SB600 64bit DMA on MSI K9A2 Platinum v2
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions