diff options
author | Dave Airlie <airlied@redhat.com> | 2013-07-09 02:48:41 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-07-09 02:48:41 +0200 |
commit | fd0932d7f80146f115671a165461c6f877620abb (patch) | |
tree | 29203180ce28a2409b52b44655b2b04908de0ce6 /sound/oss/sound_config.h | |
parent | Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/... (diff) | |
parent | drm/nvc0/gr: fix gpc firmware regression (diff) | |
download | linux-fd0932d7f80146f115671a165461c6f877620abb.tar.xz linux-fd0932d7f80146f115671a165461c6f877620abb.zip |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
Two minor fixes for regressions.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nvc0/gr: fix gpc firmware regression
drm/nouveau: fix minor thinko causing bo moves to not be async on kepler
Diffstat (limited to 'sound/oss/sound_config.h')
0 files changed, 0 insertions, 0 deletions