diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-06-04 13:29:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-06-04 13:29:13 +1000 |
| commit | 0a4ae727d6aa459247b027387edb6ff99f657792 (patch) | |
| tree | c4b8df20065905271be593123e6cc9dd97c6d7da /net/decnet/dn_fib.c | |
| parent | ba6f582606655754d9dfbfc9dffe75dcf806f1dd (diff) | |
| parent | 91b0275c0ecd1870c5f8bfb73e2da2d6c29414b3 (diff) | |
| download | blackbird-op-linux-0a4ae727d6aa459247b027387edb6ff99f657792.tar.gz blackbird-op-linux-0a4ae727d6aa459247b027387edb6ff99f657792.zip | |
Merge branch 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes
The first one is a one liner fixing a stupid typo in the VM handling code and is only relevant if play with one of the VM defines.
The other two switches CIK to use the CPDMA instead of the SDMA for buffer moves, as it turned out the SDMA is still sometimes not 100% reliable.
* 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux:
drm/radeon: use the CP DMA on CIK
drm/radeon: sync page table updates
drm/radeon: fix vm buffer size estimation
Diffstat (limited to 'net/decnet/dn_fib.c')
0 files changed, 0 insertions, 0 deletions
