Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 30 Oct 2014 20:54:51 +0000 (06:54 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 30 Oct 2014 20:54:51 +0000 (06:54 +1000)
commitd34d4d8af8d24afe4e16128e4e7f5c5967c89027
tree1f784a7dd68fc9a4e6b3c0c19db2c7e259c0d92a
parent8d1806aa7000bac6c52d642cf91a2f4b0d7b3fff
parent072c44bf24b3384e1e9873df5ddefe2be3aaac8e
Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

- dpm stability fixes for SI and KV
- remove an invalid pci id
- kmalloc_array fixes
- minor cleanups

* 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: remove some buggy dead code
  drm/radeon: remove invalid pci id
  drm/radeon: dpm fixes for asrock systems
  radeon: clean up coding style differences in radeon_get_bios()
  drm/radeon: Use drm_malloc_ab instead of kmalloc_array
  drm/radeon/dpm: disable ulv support on SI