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
..
2009-09-11 16:58:51 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2008-11-25 18:25:32 -08:00
2009-04-04 16:51:14 -07:00
2009-08-12 23:03:00 -07:00
2009-08-12 22:53:28 -07:00
2009-08-12 23:03:01 -07:00
2009-08-12 23:03:01 -07:00
2009-08-12 23:03:01 -07:00
2009-08-15 18:50:44 -07:00
2009-08-05 12:22:11 -07:00
2009-07-06 18:54:51 -07:00
2008-11-25 18:23:59 -08:00
2009-02-04 16:43:44 -08:00
2009-02-26 21:02:19 -08:00
2008-11-25 18:24:57 -08:00
2009-04-16 02:20:08 -07:00
2009-09-07 01:56:52 -07:00
2009-01-06 10:47:44 -08:00
2009-07-06 13:05:13 -07:00
2009-07-20 08:23:26 -07:00
2008-11-25 18:24:38 -08:00
2009-04-16 02:20:16 -07:00
2009-09-03 20:02:13 -07:00
2009-04-16 02:20:21 -07:00
2009-07-16 09:14:23 -07:00
2009-04-29 17:32:34 -07:00
2009-08-02 12:20:40 -07:00
2009-03-27 00:46:48 -07:00
2008-11-25 18:25:49 -08:00
2009-07-12 14:20:04 -07:00
2009-09-11 16:50:16 -07:00
2009-09-02 00:44:09 -07:00
2009-01-11 00:06:36 -08:00