diff options
author | 2010-05-19 17:10:24 -0700 | |
---|---|---|
committer | 2010-05-19 17:10:24 -0700 | |
commit | 6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1 (patch) | |
tree | bf3cd405213c37f1ed363c3b2f542088e05ea571 /net/ipv4/tcp_timer.c | |
parent | Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | x86, hpet: Add reference to chipset erratum documentation for disable-hpet-msi-quirk (diff) | |
download | linux-dev-6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1.tar.xz linux-dev-6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1.zip |
Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, hpet: Add reference to chipset erratum documentation for disable-hpet-msi-quirk
x86, hpet: Restrict read back to affected ATI chipsets
Diffstat (limited to 'net/ipv4/tcp_timer.c')
0 files changed, 0 insertions, 0 deletions