Merge branch 'pxa/devel' into next/devel2

Conflicts:
	arch/arm/mach-s3c2416/s3c2416.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-s3c2410/s3c2410.c
Simple merge

diff --cc arch/arm/mach-s3c2416/s3c2416.c
index 081ef4cb8688c0181102bbee5d407c2a537387e4,20b3fdfb3051fb7533ec67cee9b5659b13dfda22..ee214bc83c8352a0e520401a5013dd01fe13a04f
--- 1/arch/arm/mach-s3c2416/s3c2416.c
--- 2/arch/arm/mach-s3c2416/s3c2416.c
+++ b/arch/arm/mach-s3c2416/s3c2416.c
@@@ -98,9 -97,9 +98,11 @@@ int __init s3c2416_init(void
  
        s3c_fb_setname("s3c2443-fb");
  
 +      s3c_adc_setname("s3c2416-adc");
 +
+ #ifdef CONFIG_PM
        register_syscore_ops(&s3c2416_pm_syscore_ops);
+ #endif
        register_syscore_ops(&s3c24xx_irq_syscore_ops);
  
        return sysdev_register(&s3c2416_sysdev);

diff --cc arch/arm/mach-s3c2440/s3c2440.c
Simple merge

diff --cc arch/arm/mach-s3c2440/s3c2442.c
Simple merge

diff --cc arch/arm/plat-s5p/irq-gpioint.c
Simple merge