diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-01-08 14:52:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-01-08 14:52:52 +1000 |
| commit | c75be2592c350035ce871624ebf549b4609aeeab (patch) | |
| tree | da25117dac120ea28c36a33a4ca6fd3eb3a4ebbf /crypto/serpent_generic.c | |
| parent | be8a42ae60addd8b6092535c11b42d099d6470ec (diff) | |
| parent | d1f9809ed1315c4cdc5760cf2f59626fd3276952 (diff) | |
Merge branch 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next
Alex writes:
A few more fixes for DMA and a mac quirk.
* 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: add quirk for d3 delay during switcheroo poweron for apple macbooks
drm/radeon: fix DMA CS parser for r6xx linear copy packet
drm/radeon: split r6xx and r7xx copy_dma functions
Diffstat (limited to 'crypto/serpent_generic.c')
0 files changed, 0 insertions, 0 deletions