summaryrefslogtreecommitdiff
path: root/arch/x86/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 14:51:02 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 14:51:02 -0700
commit32c15bb978c0e6ff65b3012a6af5a14c899005ce (patch)
tree29b40c7dc083a1f0e3fb199963e88bb73c8b6ea7 /arch/x86/lib
parent53253383fde9e41bc07ad4d99f1c8b537fef71d6 (diff)
parent42f77542f4a1c104bb6fbba2e18e04e84415a96b (diff)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] time: Move R4000 clockevent device code to separate configurable file [MIPS] time: Delete dead cycles_per_jiffy, mips_timer_ack and null_timer_ack [MIPS] IP32: Retire use of plat_timer_setup. [MIPS] Jazz: Retire use of plat_timer_setup. [MIPS] IP27: Convert to clock_event_device. [MIPS] JMR3927: Convert to clock_event_device. [MIPS] Always do the ARC64_TWIDDLE_PC thing.
Diffstat (limited to 'arch/x86/lib')
0 files changed, 0 insertions, 0 deletions