From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Aug 2013 18:44:18 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3d90268f79d3be17914ebacd31f3ed69cea8eab1;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fix from Dave Airlie:
 "Just a quick fix that a few people have reported, be nice to have in
  asap"

The drm tree seems to be very confused about 64-bit divides.  Here it
uses a slow 64-by-64 bit divide to divide by a small constant.  Oh well.
Doesn't look performance-critical, just stupid.

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: fix 64 bit divide in SI spm code
---

3d90268f79d3be17914ebacd31f3ed69cea8eab1