diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-11-19 14:03:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-11-22 13:20:01 +1000 |
| commit | 776d1e38c5934ba4d2e300fe4208602babae4c1d (patch) | |
| tree | 4bde9f33c015a3db7e16daeb6ebf9629571d83ac /arch | |
| parent | 6f755116c93ca35f496ccf1910dcd28cd16713e3 (diff) | |
| parent | 3bb076af2ae571a48465972d5747175cec3564cd (diff) | |
| download | linux-776d1e38c5934ba4d2e300fe4208602babae4c1d.tar.bz2 | |
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Some more misc fallout from nouveau rework.
* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau/bios: fix DCB v1.5 parsing
drm/nouveau: add missing pll_calc calls
drm/nouveau: fix crash with noaccel=1
drm/nv40: allocate ctxprog with kmalloc
drm/nvc0/disp: fix thinko in vblank regression fix..
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions