linux/arch/arm/plat-omap
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/mach Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-09-14 17:48:14 -07:00
clock.c Merge branch 'omap4' into for-next 2009-05-28 15:45:14 -07:00
common.c Merge branch 'omap4' into for-next 2009-05-28 15:45:14 -07:00
cpu-omap.c OMAP: PM: CPUfreq: obey min/max settings of policy 2009-08-05 09:10:54 -07:00
debug-devices.c ARM: OMAP: Switch to gpio_request/free calls 2008-12-10 17:35:30 -08:00
debug-leds.c ARM: OMAP: switch to standard gpio get/set calls 2008-12-10 17:35:25 -08:00
devices.c ARM: OMAP4: Add minimal support for omap4 2009-05-28 14:16:04 -07:00
dma.c Merge branch 'topic/asoc' into for-linus 2009-09-10 15:32:40 +02:00
dmtimer.c ARM: OMAP4: Add minimal support for omap4 2009-05-28 14:16:04 -07:00
fb.c ARM: OMAP: Fix printing of reserved memory for frambuffer 2009-05-11 09:58:19 -07:00
gpio.c Merge branch 'master' into devel 2009-09-12 12:04:37 +01:00
i2c.c ARM: OMAP: Update contact address of I2C registration helper 2009-05-25 11:08:43 -07:00
io.c ARM: OMAP4: Add minimal support for omap4 2009-05-28 14:16:04 -07:00
iommu.c OMAP: IOMMU: function flush_iotlb_page is not flushing correct entry 2009-06-23 13:30:25 +03:00
iopgtable.h omap iommu: tlb and pagetable primitives 2009-05-05 14:52:39 +03:00
iovmm.c omap iommu: simple virtual address space management 2009-05-19 08:23:49 +03:00
Kconfig [ARM] Kconfig: remove 'default n' 2009-05-31 15:12:25 +01:00
mailbox.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
Makefile omap iommu: entries for Kconfig and Makefile 2009-05-22 10:16:36 +03:00
mcbsp.c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-09-14 17:48:14 -07:00
mux.c ARM: OMAP4: Add minimal support for omap4 2009-05-28 14:16:04 -07:00
ocpi.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
sram.c Merge branch 'omap_fixes_31' of git://git.pwsan.com/linux-2.6 2009-08-10 14:24:18 +01:00
usb.c ARM: OMAP: get rid of OMAP_TAG_USB, v2 2009-03-23 18:51:20 -07:00