diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-20 23:54:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-20 23:54:23 -0800 |
| commit | eb2112fbcf2d97eda221790bd53cb3a2cdf58c95 (patch) | |
| tree | 1343d534a374653d26fecfb9657c9e3d3d05dbc6 /include/asm-arm/arch-s3c2410/nand.h | |
| parent | f238085415c56618e042252894f2fcc971add645 (diff) | |
| parent | 618b20a13e9ef4ed1d16f1ab94ccce8e4f55f9d9 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (29 commits)
[ARM] 4062/1: S3C24XX: Anubis and Osiris shuld have CONFIG_PM_SIMTEC
[ARM] 4060/1: update several ARM defconfigs
[ARM] 4061/1: xsc3: change of maintainer
[ARM] 4059/1: VR1000: fix LED3's platform device number
[ARM] 4022/1: iop13xx: generic irq fixups
[ARM] 4015/1: s3c2410 cpu ifdefs
[ARM] 4057/1: ixp23xx: unconditionally enable hardware coherency
[ARM] 4056/1: iop13xx: fix resource.end off-by-one in flash setup
[ARM] 4055/1: iop13xx: fix phys_io/io_pg_offst for iq81340mc/sc
[ARM] 4054/1: ep93xx: add HWCAP_CRUNCH
[ARM] 4052/1: S3C24XX: Fix PM in arch/arm/mach-s3c2410/Kconfig
[ARM] Fix warnings from asm/system.h
[ARM] 4051/1: S3C24XX: clean includes in S3C2440 and S3C2442 support
[ARM] 4050/1: S3C24XX: remove old changelogs in arch/arm/mach-s3c2410
[ARM] 4049/1: S3C24XX: fix sparse warning due to upf_t in regs-serial.h
[ARM] 4048/1: S3C24XX: make s3c2410_pm_resume() static
[ARM] 4046/1: S3C24XX: fix sparse errors arch/arm/mach-s3c2410
[ARM] 4045/1: S3C24XX: remove old VA for non-shared areas
[ARM] 4044/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2442-clock.c
[ARM] 4043/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2440-clock.c
...
Diffstat (limited to 'include/asm-arm/arch-s3c2410/nand.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/nand.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-s3c2410/nand.h b/include/asm-arm/arch-s3c2410/nand.h index e350ae2acfc..8816f7f9cee 100644 --- a/include/asm-arm/arch-s3c2410/nand.h +++ b/include/asm-arm/arch-s3c2410/nand.h @@ -1,7 +1,7 @@ /* linux/include/asm-arm/arch-s3c2410/nand.h * - * (c) 2004 Simtec Electronics - * Ben Dooks <ben@simtec.co.uk> + * Copyright (c) 2004 Simtec Electronics + * Ben Dooks <ben@simtec.co.uk> * * S3C2410 - NAND device controller platfrom_device info * |