diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-21 15:50:57 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-21 15:50:57 (GMT) |
| commit | 0ddaa974258a4cde9a06c079bfd7863644e10d31 (patch) | |
| tree | d0b70cb3f82399cb0c48e3c74d3b76639c624290 /drivers/hid/hid-roccat.c | |
| parent | 007b703b3ed74e9af9c0576e7698ccda0170d370 (diff) | |
| parent | cc3e06a57d4314ca0582fcf7d6b56dea5ca11f77 (diff) | |
| download | linux-0ddaa974258a4cde9a06c079bfd7863644e10d31.tar.xz | |
Merge branch 'drm-radeon-sun-hainan' of git://people.freedesktop.org/~airlied/linux
Pull radeon sun/hainan support from Dave Airlie:
"Since I know its outside the merge window, but since this is new hw I
thought I'd try and provoke the new hw exception, it just fills in the
blanks in the driver for the new AMD sun and hainan chipsets."
* 'drm-radeon-sun-hainan' of git://people.freedesktop.org/~airlied/linux:
drm/radeon: add Hainan pci ids
drm/radeon: add golden register settings for Hainan (v2)
drm/radeon: sun/hainan chips do not have UVD (v2)
drm/radeon: track which asics have UVD
drm/radeon: radeon-asic updates for Hainan
drm/radeon: fill in ucode loading support for Hainan
drm/radeon: don't touch DCE or VGA regs on Hainan (v3)
drm/radeon: fill in GPU init for Hainan (v2)
drm/radeon: add chip family for Hainan
Diffstat (limited to 'drivers/hid/hid-roccat.c')
0 files changed, 0 insertions, 0 deletions