diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 14:05:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 14:05:47 -0700 |
| commit | 78f28b7c555359c67c2a0d23f7436e915329421e (patch) | |
| tree | 7f8197f82f83c0c19fd9bc85b5d10b5a755d0656 /arch/arm/mach-realview/include/mach/debug-macro.S | |
| parent | 3240a77b515f4a15e24d8a3a2135bc87b02cf1d6 (diff) | |
| parent | 7bd867dfb4e0357e06a3211ab2bd0e714110def3 (diff) | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (38 commits)
x86: Move get/set_wallclock to x86_platform_ops
x86: platform: Fix section annotations
x86: apic namespace cleanup
x86: Distangle ioapic and i8259
x86: Add Moorestown early detection
x86: Add hardware_subarch ID for Moorestown
x86: Add early platform detection
x86: Move tsc_init to late_time_init
x86: Move tsc_calibration to x86_init_ops
x86: Replace the now identical time_32/64.c by time.c
x86: time_32/64.c unify profile_pc
x86: Move calibrate_cpu to tsc.c
x86: Make timer setup and global variables the same in time_32/64.c
x86: Remove mca bus ifdef from timer interrupt
x86: Simplify timer_ack magic in time_32.c
x86: Prepare unification of time_32/64.c
x86: Remove do_timer hook
x86: Add timer_init to x86_init_ops
x86: Move percpu clockevents setup to x86_init_ops
x86: Move xen_post_allocator_init into xen_pagetable_setup_done
...
Fix up conflicts in arch/x86/include/asm/io_apic.h
Diffstat (limited to 'arch/arm/mach-realview/include/mach/debug-macro.S')
0 files changed, 0 insertions, 0 deletions