summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 22:38:21 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 22:38:21 +0100
commit4646575daf21f544fc2f7e8d90d8c488948fcc7c (patch)
treefa0208fa11662c2d36e74cf6152288f8fbf7ddc9 /drivers/net
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentx86: UV RTC: Always enable RTC clocksource (diff)
downloadlinux-4646575daf21f544fc2f7e8d90d8c488948fcc7c.tar.xz
linux-4646575daf21f544fc2f7e8d90d8c488948fcc7c.zip
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: UV RTC: Always enable RTC clocksource x86: UV RTC: Rename generic_interrupt to x86_platform_ipi x86: UV RTC: Clean up error handling x86: UV RTC: Add clocksource only boot option x86: UV RTC: Fix early expiry handling
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions