From: Dave Airlie <airlied@redhat.com>
Date: Mon, 20 May 2013 23:41:33 +0000 (+1000)
Subject: Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v4.0~4020^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3f6902672c9fa3868722ef6ab8a7dd9141def6a;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm-next

Minor bug fixes.

* 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/dce2: use 10khz units for audio dto calculation
  drm/radeon: Fix VRAM size calculation for VRAM >= 4GB
  drm/radeon: Remove superfluous variable
---

a3f6902672c9fa3868722ef6ab8a7dd9141def6a