diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-05-29 04:13:52 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-05-29 04:13:52 +0300 |
| commit | 1fe7142063517dfb17bfd3ada394e1dd7ee44ba7 (patch) | |
| tree | 769fd60024af3a469a930f2c08e093e62b4f5bf7 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | d641958f658833b5866ea80861f9ff8eb1519bec (diff) | |
| parent | aaea3938b5637ffb1d77e8b7707c207b24e02937 (diff) | |
| download | linux-1fe7142063517dfb17bfd3ada394e1dd7ee44ba7.tar.xz | |
Merge branch 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Regression fix for Fermi acceleration, and fixes important to bringing
up display-less Maxwell boards.
* 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau/gr/gm204: remove a stray printk
drm/nouveau/devinit/gm100-: force devinit table execution on boards without PDISP
drm/nouveau/devinit/gf100: make the force-post condition more obvious
drm/nouveau/gr/gf100-: fix wrong constant definition
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions