diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-10 09:06:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-10 09:06:25 -0800 |
commit | 612b8507c5d545feed2437b3d2239929cac7688d (patch) | |
tree | d572f72dc262830cb6958ee97e1b2b886c845b31 /net/ipv4/tcp_timer.c | |
parent | af5feae3d7e821d8c4d38103a7f53146f2590892 (diff) | |
parent | 28a4d5675857f6386930a324317281cb8ed1e5d0 (diff) | |
download | linux-612b8507c5d545feed2437b3d2239929cac7688d.tar.gz linux-612b8507c5d545feed2437b3d2239929cac7688d.tar.bz2 linux-612b8507c5d545feed2437b3d2239929cac7688d.zip |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
* 'drm-fixes' of git://people.freedesktop.org/~airlied/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/radeon: do not continue after error from r600_ib_test
drivers/gpu/drm/drm_ioc32.c: initialize all fields
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