diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-16 19:01:46 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-16 19:01:46 -0700 | 
| commit | ec50f2a97a4a7098a81b40030e0bfe28bdc43740 (patch) | |
| tree | 3b02c10ed8578fafd2d07156ecd7896c923aee01 /arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h | |
| parent | d5fe85af85367d5892e4308f596de4e2a5fb9017 (diff) | |
| parent | e9ced8e040ebe40e9953db90acbe7d0b58702ebb (diff) | |
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
 "Fix for radeon nomodeset regression, old radeon interface cliprects
  fix, 2 qxl crasher fixes, and a couple of minor cleanups.
  I may have a new AMD hw support branch next week, its one of those
  doesn't affect anything existing just adds new support, I'll see how
  it shapes up and I might ask you to take it, just thought I'd warn in
  advance."
* 'drm-next' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: restore nomodeset operation (v2)
  qxl: fix bug with object eviction and update area
  drm/qxl: drop active_user_framebuffer as its unneeded
  qxl: drop unused variable.
  drm/qxl: fix ioport interactions for kernel submitted commands.
  drm: remove unused wrapper macros
  drm/radeon: check incoming cliprects pointer
Diffstat (limited to 'arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h')
0 files changed, 0 insertions, 0 deletions
