diff options
| author | Linus Torvalds <[email protected]> | 2011-04-21 16:57:13 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-04-21 16:57:13 +0000 |
| commit | 25b210371f76ac63b30d998549f5f4891d805f3b (patch) | |
| tree | b8a90dba0876716bdd56bf478c6949249e4a55dd /tools/perf/util/scripting-engines/trace-event-perl.c | |
| parent | Merge git://git.infradead.org/iommu-2.6 (diff) | |
| parent | drm/i915: Initialise g4x watermarks for disabled pipes (diff) | |
| download | kernel-25b210371f76ac63b30d998549f5f4891d805f3b.tar.gz kernel-25b210371f76ac63b30d998549f5f4891d805f3b.zip | |
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
drm/i915: Initialise g4x watermarks for disabled pipes
drm/i915: Sanitize the output registers after resume
drm/i915/tv: Fix modeset flickering introduced in 7f58aabc3
drm/i915/tv: Only poll for TV connections
drm/i915/tv: Remember the detected TV type
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-perl.c')
0 files changed, 0 insertions, 0 deletions