AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
4f43c2ed21
kernel_optimize_test/arch/arm/plat-s3c/include/plat
History
Linus Torvalds 2ca7d674d7 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (257 commits)
  [ARM] Update mach-types
  ARM: 5636/1: Move vendor enum to AMBA include
  ARM: Fix pfn_valid() for sparse memory
  [ARM] orion5x: Add LaCie NAS 2Big Network support
  [ARM] pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resume
  ARM: 5686/1: at91: Correct AC97 reset line in at91sam9263ek board
  ARM: 5640/1: This patch modifies the support of AC97 on the at91sam9263 ek board
  ARM: 5689/1: Update default config of HP Jornada 700-series machines
  ARM: 5691/1: fix cache aliasing issues between kmap() and kmap_atomic() with highmem
  ARM: 5688/1: ks8695_serial: disable_irq() lockup
  ARM: 5687/1: fix an oops with highmem
  ARM: 5684/1: Add nuc960 platform to w90x900
  ARM: 5683/1: Add nuc950 platform to w90x900
  ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform
  ARM: 5626/1: add suspend/resume functions to amba-pl011 serial driver
  ARM: 5625/1: fix hard coded 4K resource size in amba bus detection
  MMC: MMCI: convert realview MMC to use gpiolib
  ARM: 5685/1: Make MMCI driver compile without gpiolib
  ARM: implement highpte
  ARM: Show FIQ in /proc/interrupts on CONFIG_FIQ
  ...

Fix up trivial conflict in arch/arm/kernel/signal.c.

It was due to the TIF_NOTIFY_RESUME addition in commit d0420c83f ("KEYS:
Extend TIF_NOTIFY_RESUME to (almost) all architectures") and follow-ups.
2009-09-14 17:48:14 -07:00
..
adc.h ARM: S3C: Add ADC synchronous read call. 2009-07-18 10:15:53 +01:00
audio-simtec.h ASoC: S3C24XX: Add audio core and tlv320aic23 for Simtec boards 2009-08-21 10:52:42 +01:00
audio.h S3C: Move <mach/audio.h> to <plat/audio.h> 2009-03-05 12:01:00 +00:00
clock.h [ARM] S3C64XX: Add HCLKx2 2009-05-07 11:14:27 +01:00
cpu-freq.h ARM: S3C: CPUFREQ: Move struct s3c_cpufreq_config to cpu-freq-core.h 2009-07-30 23:22:51 +01:00
cpu.h ARM: S3C2410: Add S3C2410A sysdev. 2009-07-30 23:22:55 +01:00
debug-macro.S [ARM] S3C24A0: Debug macro definitions 2008-12-15 21:46:33 +00:00
devs.h Merge branch 'next-s3c24xx' into next-s3c 2009-08-14 15:23:34 +01:00
dma-core.h [ARM] S3C: Move DMA channel management code to plat-s3c 2009-05-01 11:39:07 +01:00
dma.h [ARM] S3C: Make common <plat/dma.h> header 2009-05-01 11:39:07 +01:00
fb.h [ARM] S3C: Add register defines for new style framebuffer 2008-12-15 23:55:10 +00:00
gpio-cfg-helpers.h [ARM] S3C: Add new GPIO configuration calls 2008-12-15 23:34:15 +00:00
gpio-cfg.h [ARM] S3C: Add new GPIO configuration calls 2008-12-15 23:34:15 +00:00
gpio-core.h [ARM] S3C: GPIO PM core GPIOlib integration 2009-05-07 11:04:56 +01:00
hwmon.h ARM: HWMON: S3C24XX series ADC driver 2009-07-18 10:15:54 +01:00
iic-core.h [ARM] S3C: Add header for initial i2c device core setup. 2008-12-15 23:47:03 +00:00
iic.h i2c-s3c2410: Simplify bus frequency calculation 2009-04-07 10:18:33 +01:00
map-base.h ARM: S3C: Update CPU register mapping practices. 2009-07-30 23:22:54 +01:00
nand.h [MTD] [NAND] S3C2410: Allow the machine code to get the BBT table from NAND 2009-06-08 12:10:36 +01:00
pm.h [ARM] S3C64XX: Initial support for PM (suspend to RAM) 2009-05-07 11:04:55 +01:00
regs-ac97.h [ARM] S3C: Move regs-ac97.h to arch/arm/plat-s3c/include/plat. 2008-10-30 10:17:14 +00:00
regs-adc.h [ARM] S3C24XX: Additional include moves 2008-10-07 23:09:51 +01:00
regs-fb.h [ARM] S3C: Add register defines for new style framebuffer 2008-12-15 23:55:10 +00:00
regs-iic.h [ARM] S3C: Move i2c headers to arch/arm/plat-s3c/include/plat. 2008-10-30 10:17:12 +00:00
regs-irqtype.h [ARM] S3C: Move S3C2410_EXTINT to common regs-irqtype.h header 2008-12-15 21:46:13 +00:00
regs-nand.h [ARM] S3C: Move nand headers to arch/arm/plat-s3c/include/plat 2008-10-30 10:17:13 +00:00
regs-rtc.h [ARM] S3C: Move regs-rtc.h to arch/arm/plat-s3c/include/plat 2008-10-30 10:17:12 +00:00
regs-s3c2412-iis.h ASoC: Fix data format configuration for S3C64XX IISv2 2009-08-18 16:02:36 +01:00
regs-sdhci.h [ARM] S3C: Add Samsung SDHCI register definitions 2008-12-15 23:39:24 +00:00
regs-serial.h [ARM] S3C64XX: Add IRQ PM code 2009-05-07 11:04:56 +01:00
regs-timer.h [ARM] S3C64XX: Update TCFG for new timer divider settings. 2008-12-16 10:01:23 +00:00
regs-usb-hsotg-phy.h USB: Gadget driver for Samsung HS/OtG block 2009-06-15 21:44:47 -07:00
regs-usb-hsotg.h USB: Gadget driver for Samsung HS/OtG block 2009-06-15 21:44:47 -07:00
regs-watchdog.h [ARM] S3C: Move regs-watchdog.h to arch/arm/plat-s3c/include/plat 2008-10-30 10:17:12 +00:00
sdhci.h [ARM] S3C64XX: Add S3C6400 SDHCI setup support 2009-05-07 11:04:58 +01:00
udc-hs.h [ARM] S3C: Add USB high-speed/OtG device definitions 2009-05-16 22:13:52 +01:00
uncompress.h [ARM] 5376/1: S3C24XX: Fix sparse errors in platform uncompress.h 2009-02-19 11:30:19 +00:00
usb-control.h USB: S3C: Move usb-control.h to platform include 2009-03-24 16:20:45 -07:00
watchdog-reset.h [ARM] S3C64XX: Use common watchdog reset for system reset. 2009-05-17 23:40:30 +01:00