diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 17:36:35 (GMT) |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 17:36:35 (GMT) |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /arch/arm/plat-s3c64xx | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
download | linux-d014d043869cdc591f3a33243d3481fa4479c2d0.tar.xz |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'arch/arm/plat-s3c64xx')
-rw-r--r-- | arch/arm/plat-s3c64xx/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c64xx/Kconfig b/arch/arm/plat-s3c64xx/Kconfig index bcfa778..e6da87a 100644 --- a/arch/arm/plat-s3c64xx/Kconfig +++ b/arch/arm/plat-s3c64xx/Kconfig @@ -1,5 +1,3 @@ -# arch/arm/plat-s3c64xx/Kconfig -# # Copyright 2008 Openmoko, Inc. # Copyright 2008 Simtec Electronics # Ben Dooks <ben@simtec.co.uk> |