diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-05-20 13:31:36 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-05-20 13:31:36 +1000 |
| commit | b7cb1c50c828adaee95e8ada0e55918686245992 (patch) | |
| tree | 88694170f862f156e6f4a38b8fa207dba9200d45 /drivers/scsi/mpt2sas/mpi/mpi2_tool.h | |
| parent | e9ced8e040ebe40e9953db90acbe7d0b58702ebb (diff) | |
| parent | 81dff21b643f48c14010a97ffc799e1920d751e5 (diff) | |
Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
Fixes some s/r problem with copy engines and ZCULL issues and playlist issues
* 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau: ensure channels are stopped before saving fences for suspend
drm/nv50/fifo: prevent races between clients updating playlists
drm/nvc0/fifo: prevent CHAN_TABLE_ERROR:CHANNEL_PENDING on fifo fini
drm/nvc0/fifo: prevent races between clients updating playlists
drm/nve0/fifo: prevent races between clients updating playlists
drm/nve0/ltcg: poke the partition count into yet another register
drm/nvc0/ltcg: fix handling of disabled partitions
drm/nvc0/ce: disable ce1 on a number of chipsets
drm/nouveau/bios: fix thinko in ZM_MASK_ADD opcode
drm/nouveau: fix build with nv50->nvc0
Diffstat (limited to 'drivers/scsi/mpt2sas/mpi/mpi2_tool.h')
0 files changed, 0 insertions, 0 deletions