From: Dave Airlie <airlied@redhat.com>
Date: Thu, 30 Oct 2014 20:54:51 +0000 (+1000)
Subject: Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v3.18-rc3~3^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d34d4d8af8d24afe4e16128e4e7f5c5967c89027;p=~emulex%2Finfiniband.git

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
---

d34d4d8af8d24afe4e16128e4e7f5c5967c89027