dect
/
linux-2.6
Archived
13
0
Fork 0
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/arch/arm/plat-s3c
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
..
include Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-09-14 17:48:14 -07:00
Kconfig ARM: S3C: Add S3C_DEV_NAND Kconfig entry 2009-08-16 23:54:58 +01:00
Makefile ARM: S3C: Add S3C_DEV_NAND Kconfig entry 2009-08-16 23:54:58 +01:00
clock.c [ARM] S3C: Do not set clk->owner field if unset 2009-05-15 15:21:57 +01:00
dev-fb.c [ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c 2009-01-08 16:29:42 +00:00
dev-hsmmc.c [ARM] S3C6410: Add helper for setting SDHCI device information 2008-12-15 23:39:34 +00:00
dev-hsmmc1.c [ARM] S3C: Add SDHCI (HSMMC) channel 1 device definition 2008-12-15 23:40:07 +00:00
dev-i2c0.c i2c-s3c2410: Simplify bus frequency calculation 2009-04-07 10:18:33 +01:00
dev-i2c1.c i2c-s3c2410: Simplify bus frequency calculation 2009-04-07 10:18:33 +01:00
dev-nand.c ARM: S3C: move s3c_device_nand from plat-s3c24xx to plat-s3c 2009-07-31 00:10:24 +01:00
dev-usb-hsotg.c [ARM] S3C: Add USB high-speed/OtG device definitions 2009-05-16 22:13:52 +01:00
dev-usb.c [ARM] S3C: Rename S3C24XX_PA_USBHOST to S3C_PA_USBHOST 2009-05-07 11:04:54 +01:00
dma.c [ARM] S3C: Move DMA channel management code to plat-s3c 2009-05-01 11:39:07 +01:00
gpio-config.c [ARM] S3C: Fix gpio-config off-by-one bug 2009-06-22 14:12:39 +01:00
gpio.c [ARM] S3C: GPIO PM core GPIOlib integration 2009-05-07 11:04:56 +01:00
init.c [ARM] S3C: Remove unnecessary <linux/delay.h> includes 2008-12-18 16:36:02 +00:00
pm-check.c [ARM] S3C: Do not kmalloc/kfree during inner suspend code. 2009-03-08 13:19:54 +00:00
pm-gpio.c [ARM] S3C: GPIO PM core GPIOlib integration 2009-05-07 11:04:56 +01:00
pm.c [ARM] S3C64XX: Initial support for PM (suspend to RAM) 2009-05-07 11:04:55 +01:00
pwm-clock.c [ARM] S3C: Update time initialisation to fix S3C64XX time problems 2008-12-16 10:13:02 +00:00
pwm.c Merge branch 'master' into devel 2009-09-12 12:04:37 +01:00
time.c [ARM] S3C: Update time initialisation to fix S3C64XX time problems 2008-12-16 10:13:02 +00:00