diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-12 18:48:17 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-12 18:48:17 +0300 |
| commit | 94fa83c424321189ca24fb6cb4c0d224cdedc72d (patch) | |
| tree | cad25cb383c0da07abb39ae57621f00c87135202 /net/mac802154/tx.c | |
| parent | 266ae4e6155419b3904f45b132db26d4b6fdceaf (diff) | |
| parent | a393c730ab69617c3291a3b0b2a228c9be2fc28c (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"As per your -rc2 announce, this is small and urgent only,
The radeon one is for a regression in 3.4 so we need this one in your
tree so we can send the stable one out, code in 3.4 broke some old
userspaces. The max props increase fixes spew being seen on a few
machines. And a ttm regression to fix some accounting issues that
affect vmwgfx."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/ttm: Fix buffer object metadata accounting regression v2
drm: increase DRM_OBJECT_MAX_PROPERTY to 24
drm/radeon: fix tiling and command stream checking on evergreen v3
Diffstat (limited to 'net/mac802154/tx.c')
0 files changed, 0 insertions, 0 deletions