diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-27 19:41:51 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-27 19:41:51 +0100 |
commit | 49fdf6785fd660e18a1eb4588928f47e9fa29a9a (patch) | |
tree | 71cccf385d734bfc33e9cd4752b5046aef99c130 /drivers/gpu/drm/drm_dma.c | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
parent | libata: fix NCQ devices behind port multipliers (diff) | |
download | linux-49fdf6785fd660e18a1eb4588928f47e9fa29a9a.tar.xz linux-49fdf6785fd660e18a1eb4588928f47e9fa29a9a.zip |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
libata: fix NCQ devices behind port multipliers
scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map
Diffstat (limited to 'drivers/gpu/drm/drm_dma.c')
0 files changed, 0 insertions, 0 deletions