diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-07 16:14:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-07 16:14:37 -0400 |
| commit | 950b0d28378c4ee63a30dad732a8319c8a41c95d (patch) | |
| tree | e7e8a41ac5b11b650180a84c92f517d15907a9ba /include/asm-arm/arch-ixp4xx/dma.h | |
| parent | 2557a933b795c1988c721ebb871cd735128bb9cb (diff) | |
| parent | 871de939030c903fd5ed50a7c4c88e02998e1cbc (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: fix 64-bit asm NOPS for CONFIG_GENERIC_CPU
x86: fix call to set_cyc2ns_scale() from time_cpufreq_notifier()
revert "x86: tsc prevent time going backwards"
Diffstat (limited to 'include/asm-arm/arch-ixp4xx/dma.h')
0 files changed, 0 insertions, 0 deletions