diff options
| author |   Dave Airlie <airlied@redhat.com> | 2015-10-12 13:59:04 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-10-12 13:59:04 +1000 |
| commit | 7b98040a7718663903bb25c06c7aed9801abbd9d (patch) | |
| tree | 8920d665e9ef2016fe0c378f30e16ac17cea8283 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | drm: Fix locking for sysfs dpms file (diff) | |
| parent | drm/nouveau/bios: fix OF loading (diff) | |
| download | linux-dev-7b98040a7718663903bb25c06c7aed9801abbd9d.tar.xz linux-dev-7b98040a7718663903bb25c06c7aed9801abbd9d.zip | |
Merge branch 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Nothing too crazy here, a couple of regression fixes + runpm/fbcon
race fix.
* 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau/bios: fix OF loading
drm/nouveau/fbcon: take runpm reference when userspace has an open fd
drm/nouveau/nouveau: Disable AGP for SiS 761
drm/nouveau/display: allow up to 16k width/height for fermi+
drm/nouveau/bios: translate devinit pri/sec i2c bus to internal identifiers
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions