diff options
author | Dave Airlie <airlied@redhat.com> | 2012-02-10 08:35:19 +0000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-02-10 08:35:19 +0000 |
commit | 28a4d5675857f6386930a324317281cb8ed1e5d0 (patch) | |
tree | 9293e17abc937153b5a5b614153c6b32bfff2434 /net/ipv4/tcp_timer.c | |
parent | 3fe89a0c799c62de68e9e6d6e33899cd7e0da901 (diff) | |
parent | 617cf884810b44384fe8e9431e9babeb80a2ff37 (diff) | |
download | linux-28a4d5675857f6386930a324317281cb8ed1e5d0.tar.gz linux-28a4d5675857f6386930a324317281cb8ed1e5d0.tar.bz2 linux-28a4d5675857f6386930a324317281cb8ed1e5d0.zip |
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux into drm-fixes
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux:
drm/i915: fixup interlaced bits clearing in PIPECONF on PCH_SPLIT (v2)
drm/i915: no lvds quirk for AOpen MP45
drm/i915: Force explicit bpp selection for intel_dp_link_required
drm/i915: fixup interlaced bits clearing in PIPECONF on PCH_SPLIT
drm/i915:: Disable FBC on SandyBridge
Diffstat (limited to 'net/ipv4/tcp_timer.c')
0 files changed, 0 insertions, 0 deletions