diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-11 07:55:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-11 07:55:39 -0700 |
| commit | 5a05e5bf204e729b79e9462785f2fa09d5126855 (patch) | |
| tree | 02a12cfad8c17835cc2689cb35a0fa979cedfc1e /include/asm-arm/arch-s3c2410/bast-irq.h | |
| parent | 08a55c01b504360d48b8123c87b383f7e6a2ef21 (diff) | |
| parent | d17f901defef635292f90a969dadfdbd95b0f104 (diff) | |
| download | kernel-crypto-5a05e5bf204e729b79e9462785f2fa09d5126855.tar.gz kernel-crypto-5a05e5bf204e729b79e9462785f2fa09d5126855.tar.xz kernel-crypto-5a05e5bf204e729b79e9462785f2fa09d5126855.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3778/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [simtec]
[ARM] 3783/1: S3C2412: fix IRQ_EINT0 to IRQ_EINT3 handling
[ARM] 3779/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [left]
[ARM] 3777/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410 [regs-*.h]
[ARM] 3776/1: S3C24XX: remove changelogs from include/asm-arm/arch-s3c2410
[ARM] 3775/1: S3C24XX: do not add same sysdev_driver to two classes
[ARM] 3774/1: S3C24XX: SMDK2413 has two machine IDs
[ARM] 3773/1: Add the HWCAP_VFP bit for the ARM926 CPUs
[ARM] 3772/1: Fix compilation error in mach-ixp4xx/nslu2*
[ARM] 3767/1: S3C24XX: remove changelog comments from arch/arm/mach-s3c2410
[ARM] 3766/1: Fix typo in ARM _raw_read_trylock
Diffstat (limited to 'include/asm-arm/arch-s3c2410/bast-irq.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/bast-irq.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-arm/arch-s3c2410/bast-irq.h b/include/asm-arm/arch-s3c2410/bast-irq.h index b79b47f0d12..15ffa66f501 100644 --- a/include/asm-arm/arch-s3c2410/bast-irq.h +++ b/include/asm-arm/arch-s3c2410/bast-irq.h @@ -8,11 +8,7 @@ * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. - * - * Changelog: - * 14-Sep-2004 BJD Fixed IRQ_USBOC definition - * 06-Jan-2003 BJD Linux 2.6.0 version - */ +*/ #ifndef __ASM_ARCH_BASTIRQ_H #define __ASM_ARCH_BASTIRQ_H |