diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-27 02:55:26 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-27 02:55:26 +0200 |
| commit | 1190944f4b12203330ac5ed8784f6c181bf26f2d (patch) | |
| tree | 8ef9d1e28d8a552a295d3b3ca134fcc147cbd323 /fs/proc/proc_net.c | |
| parent | Merge git://git.infradead.org/intel-iommu (diff) | |
| parent | Merge tag 'drm-intel-next-fixes-2015-04-25' of git://anongit.freedesktop.org/... (diff) | |
| download | linux-1190944f4b12203330ac5ed8784f6c181bf26f2d.tar.xz linux-1190944f4b12203330ac5ed8784f6c181bf26f2d.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull intel drm fixes from Dave Airlie.
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg
drm/i915: Workaround to avoid lite restore with HEAD==TAIL
drm/i915: cope with large i2c transfers
Diffstat (limited to 'fs/proc/proc_net.c')
0 files changed, 0 insertions, 0 deletions