diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-27 16:51:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-27 16:51:14 -0700 |
| commit | 63994137eb53bb0fc42ad180c0ce509d3eb3bdc9 (patch) | |
| tree | 313860f1fa78fae9ece90bb8b01103a914281b42 /mm/huge_memory.c | |
| parent | a31fb6988a37f46f3a677aa5bc982094f3a03567 (diff) | |
| parent | d638163099c86f65984d85aab7ddf2cf78fa3a16 (diff) | |
| download | blackbird-op-linux-63994137eb53bb0fc42ad180c0ce509d3eb3bdc9.tar.gz blackbird-op-linux-63994137eb53bb0fc42ad180c0ce509d3eb3bdc9.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"The three nouveau fixes quiten unneeded dmesg spam that people are
seeing and pondering,
The udl fix stops it from trying to driver monitors that are too big,
where we get a black screen.
And a vmware memory alloc problem."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/nvc0/fifo: ignore bits in PFIFO_INTR that aren't set in PFIFO_INTR_EN
drm/udl: limit modes to the sku pixel limits.
vmwgfx: corruption in vmw_event_fence_action_create()
drm/nvc0/ltcg: mask off intr 0x10
drm/nouveau: silence a debug message triggered by newer userspace
Diffstat (limited to 'mm/huge_memory.c')
0 files changed, 0 insertions, 0 deletions
