diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-31 03:17:10 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-31 03:17:10 +0400 |
| commit | 418a95bc0e26c27b693eb6276f92012f45ed568f (patch) | |
| tree | 923fde6851c3c84c62727a5df2cc8b256856b657 /drivers/uwb/scan.c | |
| parent | 155e3a353943a3e713cd33357cfd58e995900a81 (diff) | |
| parent | 6e4dcff3adbf25acb87e74500a58e3c07bdec40f (diff) | |
| download | linux-418a95bc0e26c27b693eb6276f92012f45ed568f.tar.xz | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Since we are getting to the pointy end, one i915 black screen on some
machines, and one vmwgfx stop userspace ability to nuke the VM,
There might be one or two ati or nouveau fixes trickle in before
final, but I think this should pretty much be it"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/vmwgfx: Split GMR2_REMAP commands if they are to large
drm/i915: ivb: fix edp voltage swing reg val
Diffstat (limited to 'drivers/uwb/scan.c')
0 files changed, 0 insertions, 0 deletions