kernel_optimize_test/drivers/misc
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
..
c2port c2port: annotate bitfield for kmemcheck 2009-06-15 15:49:34 +02:00
cb710 cb710: use SG_MITER_TO_SG/SG_MITER_FROM_SG 2009-07-31 12:28:46 +02:00
eeprom eeprom/at25: bugfix "not ready" timeout after write 2009-07-29 19:10:35 -07:00
hdpuftrs hdpuftrs: fix build 2008-10-30 11:38:46 -07:00
ibmasm Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-01-07 11:31:52 -08:00
sgi-gru headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
sgi-xp drivers: Kill now superfluous ->last_rx stores 2009-09-02 23:07:36 -07:00
atmel_pwm.c atmel_pwm: set up only one PWM clock when allocating a clock 2008-07-24 10:47:25 -07:00
atmel_tclib.c atmel_tc library 2008-03-04 13:41:23 +01:00
atmel-ssc.c atmel-ssc: fix misuse of dev_dbg when requested ssc instance is not found 2009-02-05 12:56:48 -08:00
enclosure.c [SCSI] ses: fix problems caused by empty SES provided name 2009-05-15 12:20:57 -04:00
ep93xx_pwm.c ARM: 5628/1: ep93xx: Introduce Pulse Width Modulator (PWM) driver 2009-07-30 17:45:43 +01:00
hpilo.c hpilo: reduce frequency of IO operations 2009-04-01 08:59:18 -07:00
hpilo.h hpilo: reduce frequency of IO operations 2009-04-01 08:59:18 -07:00
ics932s401.c ics932s401: new clock generator chip driver 2008-11-12 17:17:18 -08:00
ioc4.c ioc4: automatically load sgiioc4 subordinate module 2009-01-06 15:59:13 -08:00
isl29003.c isl29003: fix resume functionality 2009-05-06 16:36:10 -07:00
Kconfig ARM: 5628/1: ep93xx: Introduce Pulse Width Modulator (PWM) driver 2009-07-30 17:45:43 +01:00
kgdbts.c kgdbts: Use HW breakpoints with CONFIG_DEBUG_RODATA 2008-05-28 12:49:57 -05:00
lkdtm.c NULL noise: drivers/misc 2008-03-30 14:18:41 -07:00
Makefile ARM: 5628/1: ep93xx: Introduce Pulse Width Modulator (PWM) driver 2009-07-30 17:45:43 +01:00
phantom.c trivial: fix an -> a typos in documentation and comments 2009-01-06 11:28:07 +01:00
tifm_7xx1.c dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) 2009-04-07 08:31:11 -07:00
tifm_core.c tifm: struct device - replace bus_id with dev_name(), dev_set_name() 2009-01-06 10:44:35 -08:00