diff options
| author | Linus Torvalds | 2011-04-21 09:57:13 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-04-21 09:57:13 -0700 |
| commit | 25b210371f76ac63b30d998549f5f4891d805f3b (patch) | |
| tree | b8a90dba0876716bdd56bf478c6949249e4a55dd /kernel/futex.c | |
| parent | ec616048ea21da2b32ed1a820e637c74c61c618c (diff) | |
| parent | 5c72d064f7ead1126bed6faab0c2bfb7418036e2 (diff) | |
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 'kernel/futex.c')
0 files changed, 0 insertions, 0 deletions