diff options
| author |   Dave Airlie <airlied@redhat.com> | 2010-06-01 11:32:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-06-01 11:32:06 +1000 |
| commit | afa3b60c905f606e8245115474d77787035e02eb (patch) | |
| tree | f9ff2222404da700c7bbe651ce63d4e1d6e9456f /net/ipv4/tcp_timer.c | |
| parent | Merge branch 'drm-vmware-fixes' into drm-testing (diff) | |
| parent | drm/kms: disable/enable poll around switcheroo on/off (diff) | |
| download | linux-dev-afa3b60c905f606e8245115474d77787035e02eb.tar.xz linux-dev-afa3b60c905f606e8245115474d77787035e02eb.zip | |
Merge branch 'drm-switcheroo-fixes' into drm-testing
* drm-switcheroo-fixes:
drm/kms: disable/enable poll around switcheroo on/off
drm/nouveau: fixup confusion over which handle the DSM is hanging off.
drm/nouveau: attempt to get bios from ACPI v3
Diffstat (limited to 'net/ipv4/tcp_timer.c')
0 files changed, 0 insertions, 0 deletions