leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4321532cec
linux/arch/arm/mach-omap2
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
..
board-2430sdp.c OMAP3 SDRC: add support for 2 SDRAM chip selects 2009-07-24 19:43:25 -06:00
board-3430sdp.c OMAP3 SDRC: add support for 2 SDRAM chip selects 2009-07-24 19:43:25 -06:00
board-4430sdp.c Merge branch 'master' into devel 2009-09-12 12:04:37 +01:00
board-apollon.c OMAP3 SDRC: add support for 2 SDRAM chip selects 2009-07-24 19:43:25 -06:00
board-generic.c OMAP3 SDRC: add support for 2 SDRAM chip selects 2009-07-24 19:43:25 -06:00
board-h4.c OMAP3 SDRC: add support for 2 SDRAM chip selects 2009-07-24 19:43:25 -06:00
board-ldp.c OMAP3 SDRC: add support for 2 SDRAM chip selects 2009-07-24 19:43:25 -06:00
board-omap3beagle.c OMAP3: Setup MUX settings for SDRC CKE signals 2009-07-24 19:43:25 -06:00
board-omap3evm.c Merge branch 'omap_fixes_31' of git://git.pwsan.com/linux-2.6 2009-08-10 14:24:18 +01:00
board-omap3pandora.c OMAP3: Setup MUX settings for SDRC CKE signals 2009-07-24 19:43:25 -06:00
board-overo.c Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm 2009-08-10 15:50:27 +01:00
board-rx51-peripherals.c OMAP3: RX51: Define TWL4030 USB transceiver in board file 2009-08-10 14:49:51 +03:00
board-rx51.c OMAP3: Setup MUX settings for SDRC CKE signals 2009-07-24 19:43:25 -06:00
board-zoom2.c OMAP3 SDRC: add support for 2 SDRAM chip selects 2009-07-24 19:43:25 -06:00
board-zoom-debugboard.c ARM: OMAP3: Add support for OMAP3 Zoom2 board 2009-05-28 14:04:04 -07:00
clock24xx.c OMAP2 clock: 2430 I2CHS uses non-standard CM_IDLEST register 2009-07-24 20:10:36 -06:00
clock24xx.h OMAP2 clock: 2430 I2CHS uses non-standard CM_IDLEST register 2009-07-24 20:10:36 -06:00
clock34xx.c OMAP3 clock: correct module IDLEST bits: SSI; DSS; USBHOST; HSOTGUSB 2009-07-24 20:10:36 -06:00
clock34xx.h OMAP3 clock: correct module IDLEST bits: SSI; DSS; USBHOST; HSOTGUSB 2009-07-24 20:10:36 -06:00
clock.c OMAP2/3 clock: split, rename omap2_wait_clock_ready() 2009-07-24 20:10:35 -06:00
clock.h OMAP2/3 clock: split, rename omap2_wait_clock_ready() 2009-07-24 20:10:35 -06:00
clockdomain.c [ARM] omap: ensure that failing power domain lookups produce errors 2009-02-23 14:55:34 +00:00
clockdomains.h OMAP3: PM: D2D clockdomain supports SW supervised transitions 2009-05-28 10:59:08 -07:00
cm-regbits-24xx.h [ARM] OMAP2 PRCM: clean up CM_IDLEST bits 2009-02-08 17:50:37 +00:00
cm-regbits-34xx.h OMAP3: PM: Add D2D clocks and auto-idle setup to PRCM init 2009-05-28 10:59:07 -07:00
cm.h OMAP3: PM: CM_REGADDR macros using wrong name 2009-08-05 09:10:50 -07:00
control.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
devices.c ARM: OMAP2: Fix SPI driver failure on 2420 when running multi-omap config 2009-05-12 11:20:30 -07:00
gpmc-onenand.c OMAP2/3: gpmc-onenand: correct use of async timings 2009-06-23 13:30:24 +03:00
gpmc-smc91x.c ARM: OMAP2/3: Add generic smc91x support when connected to GPMC 2009-05-28 13:23:52 -07:00
gpmc.c ARM: OMAP4: Add minimal support for omap4 2009-05-28 14:16:04 -07:00
id.c OMAP2/3: Add omap_type() for determining GP/EMU/HS 2009-06-23 13:30:23 +03:00
io.c OMAP3 SDRC: add support for 2 SDRAM chip selects 2009-07-24 19:43:25 -06:00
iommu2.c omap iommu: omap2 architecture specific functions 2009-05-05 14:52:39 +03:00
irq.c OMAP: Add new function to check wether there is irq pending 2009-05-28 10:59:04 -07:00
Kconfig ARM: OMAP4: Add support for 4430 SDP 2009-05-28 14:16:05 -07:00
mailbox.c OMAP2/3: omap mailbox: platform_get_irq() error ignored 2009-06-23 13:30:22 +03:00
Makefile ARM: OMAP4: SMP: Enable SMP support for OMAP4430 2009-06-09 13:04:06 +05:30
Makefile.boot [ARM] 3145/1: OMAP 3a/5: Add support for omap24xx 2005-11-10 14:26:51 +00:00
mcbsp.c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-09-14 17:48:14 -07:00
mmc-twl4030.c OMAP2/3: mmc-twl4030: Free up MMC regulators while cleaning up 2009-08-10 14:49:51 +03:00
mmc-twl4030.h ARM: OMAP3: mmc-twl4030 uses regulator framework 2009-05-28 14:04:03 -07:00
mux.c OMAP3: Setup MUX settings for SDRC CKE signals 2009-07-24 19:43:25 -06:00
omap3-iommu.c omap iommu: add MPU_BRIDGE_IOMMU for tidspbridge migration 2009-05-22 10:17:02 +03:00
omap-headsmp.S ARM: OMAP4: SMP: Add OMAP4430 SMP board files 2009-06-09 13:03:50 +05:30
omap-smp.c ARM: OMAP4: SMP: Add OMAP4430 SMP board files 2009-06-09 13:03:50 +05:30
pm24xx.c OMAP2/3: PM: make PM __init calls static 2009-08-05 09:10:50 -07:00
pm34xx.c OMAP3: PM: Fix wrong sequence in suspend. 2009-08-05 09:10:54 -07:00
pm-debug.c OMAP2/3: PM: push core PM code from linux-omap 2009-05-28 10:58:50 -07:00
pm.h OMAP2/3: PM: make PM __init calls static 2009-08-05 09:10:50 -07:00
powerdomain.c OMAP2 clock/powerdomain: off by 1 error in loop timeout comparisons 2009-06-19 19:09:32 -06:00
powerdomains24xx.h ARM: OMAP2: Powerdomain: Add OMAP2 powerdomains 2008-08-19 11:08:42 +03:00
powerdomains34xx.h [ARM] OMAP3 powerdomains: make USBTLL SAR only available on ES3.1 and beyond 2009-02-23 14:52:51 +00:00
powerdomains.h [ARM] OMAP3 powerdomains: make USBTLL SAR only available on ES3.1 and beyond 2009-02-23 14:52:51 +00:00
prcm-common.h OMAP2/3: PM: push core PM code from linux-omap 2009-05-28 10:58:50 -07:00
prcm.c OMAP2/3 clock: split, rename omap2_wait_clock_ready() 2009-07-24 20:10:35 -06:00
prm-regbits-24xx.h ARM: OMAP2: Powerdomain: Add OMAP2 powerdomains 2008-08-19 11:08:42 +03:00
prm-regbits-34xx.h ARM: OMAP3: Fix HW SAVEANDRESTORE shift define 2009-05-16 08:28:17 -07:00
prm.h OMAP3: PM: prevent module wakeups from waking IVA2 2009-05-28 10:59:10 -07:00
sdram-micron-mt46h32m32lf-6.h ARM: OMAP3: SDRC: add timing data for Micron MT46H32M32LF-6, v2 2009-05-28 14:03:59 -07:00
sdram-qimonda-hyb18m512160af-6.h ARM: OMAP3: SDRC: add timing data for Qimonda HYB18M512160AF-6 2009-05-28 14:03:59 -07:00
sdrc2xxx.c ARM: OMAP2/3: Remove OMAP_PRM_REGADDR and OMAP2_PRM_BASE 2009-05-25 11:26:42 -07:00
sdrc.c OMAP2/3 SDRC: don't set SDRC_POWER.PWDENA on boot 2009-07-24 19:44:01 -06:00
sdrc.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
serial.c Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-stable 2009-08-05 22:10:52 +01:00
sleep24xx.S OMAP2/3: PM: push core PM code from linux-omap 2009-05-28 10:58:50 -07:00
sleep34xx.S OMAP2/3: PM: push core PM code from linux-omap 2009-05-28 10:58:50 -07:00
sram34xx.S OMAP3 SDRC: Move the clk stabilization delay to the right place 2009-07-24 20:10:35 -06:00
sram242x.S ARM: OMAP2/3: Remove OMAP_PRM_REGADDR and OMAP2_PRM_BASE 2009-05-25 11:26:42 -07:00
sram243x.S ARM: OMAP2/3: Remove OMAP_PRM_REGADDR and OMAP2_PRM_BASE 2009-05-25 11:26:42 -07:00
timer-gp.c ARM: OMAP4: SMP: Add mpu timer support for OMAP4430 2009-06-09 13:03:59 +05:30
timer-mpu.c ARM: OMAP4: SMP: Add mpu timer support for OMAP4430 2009-06-09 13:03:59 +05:30
usb-musb.c USB: musb: fix the nop registration for OMAP3EVM 2009-08-07 16:05:13 -07:00
usb-tusb6010.c ARM: OMAP2: Fix tusb6010 init error and compilation warning 2009-05-12 11:20:02 -07:00