diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 10:52:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 10:52:30 +0200 |
| commit | c493756e2a8a78bcaae30668317890dcfe86e7c3 (patch) | |
| tree | 8fb40782e79472ed882ff2098d4dd295557278ee /arch/arm/lib/io-readsb.S | |
| parent | Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | MAINTAINERS: remove colon from headings (diff) | |
| download | linux-c493756e2a8a78bcaae30668317890dcfe86e7c3.tar.xz linux-c493756e2a8a78bcaae30668317890dcfe86e7c3.zip | |
Merge branch 'linus' into oprofile
Conflicts:
arch/x86/kernel/apic_32.c
include/linux/pci_ids.h
Diffstat (limited to 'arch/arm/lib/io-readsb.S')
| -rw-r--r-- | arch/arm/lib/io-readsb.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/lib/io-readsb.S b/arch/arm/lib/io-readsb.S index fb966ad0276f..9f4238987fe9 100644 --- a/arch/arm/lib/io-readsb.S +++ b/arch/arm/lib/io-readsb.S @@ -120,3 +120,4 @@ ENTRY(__raw_readsb) strgtb r3, [r1] ldmfd sp!, {r4 - r6, pc} +ENDPROC(__raw_readsb) |