iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/arm
History
Arnd Bergmann eed1e57650 Merge branch 'stericsson/cleanup' into next/timer 
The timer and cleanup branches from stericsson conflict,
so I'm merging them here.

Conflicts:
	arch/arm/mach-ux500/Makefile
	arch/arm/mach-ux500/cpu.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-10-31 23:42:23 +01:00
..
boot
arm/dt: Tegra: Update SDHCI nodes to match bindings
2011-09-20 22:56:53 +02:00
common
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
configs
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
include/asm
ARM: 7080/1: l2x0: make sure I&D are not locked down on init
2011-09-07 00:48:03 +01:00
kernel
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-08-29 16:34:07 -07:00
lib
arm: remove "optimized" SHA1 routines
2011-08-07 14:07:03 -07:00
mach-at91
at91: at91sam9261.c: fix typo in t2_clk alias for atmel_tcb.0
2011-08-24 13:10:29 +02:00
mach-bcmring
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:12:10 -07:00
mach-clps711x
arm: Fold irq_set_chip/irq_set_handler
2011-03-29 14:47:58 +02:00
mach-cns3xxx
ARM: cns3xxx: Fix newly introduced warnings in the PCIe code
2011-09-09 23:33:34 +04:00
mach-davinci
ARM: davinci: fix cache flush build error
2011-09-07 17:22:12 +05:30
mach-dove
ARM: Dove: fix second SPI initialization call
2011-09-14 14:31:43 +02:00
mach-ebsa110
arm: Fold irq_set_chip/irq_set_handler
2011-03-29 14:47:58 +02:00
mach-ep93xx
ARM: 6967/1: ep93xx: ts72xx: fix board model detection
2011-08-15 11:58:59 +01:00
mach-exynos4
ARM: EXYNOS4: fix incorrect pad configuration for keypad row lines
2011-09-15 15:54:20 +09:00
mach-footbridge
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-08-29 16:34:07 -07:00
mach-gemini
Merge git://git.infradead.org/mtd-2.6
2011-05-27 20:06:53 -07:00
mach-h720x
Merge branch 'devel-stable' into for-next
2011-07-22 23:09:07 +01:00
mach-imx
ARM: 7051/1: cpuimx* boards: fix mach-types errors
2011-08-22 15:57:22 +01:00
mach-integrator
mach-integrator: fix VGA base regression
2011-09-20 22:58:41 +02:00
mach-iop13xx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-iop32x
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-iop33x
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-ixp4xx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-ixp23xx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-ixp2000
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-kirkwood
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-ks8695
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-l7200/include/mach
…
mach-lpc32xx
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-mmp
ARM: mmp: Change the way we use timer 0 as clockevent timer.
2011-08-11 10:10:46 +08:00
mach-msm
Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next
2011-08-01 15:16:05 +01:00
mach-mv78xx0
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-mx5
ARM: mx5: board-cpuimx51.c fixup irq_to_gpio() usage
2011-08-08 08:24:16 +02:00
mach-mxs
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-netx
ARM: 6827/1: mach-netx: delete hardcoded periphid
2011-05-26 10:33:34 +01:00
mach-nomadik
ARM: Consolidate the clkdev header files
2011-07-19 18:09:45 +02:00
mach-nuc93x
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:12:10 -07:00
mach-omap1
ARM: OMAP1: dmtimer: conversion to platform devices
2011-09-21 15:50:31 -07:00
mach-omap2
ARM: OMAP: dmtimer: low-power mode support
2011-09-21 17:07:34 -07:00
mach-orion5x
ARM: mach-orion5x: add missing header file <linux/vga.h>
2011-08-25 09:08:18 -05:00
mach-pnx4008
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:12:10 -07:00
mach-prima2
ARM: CSR: add missing sentinels to of_device_id tables
2011-09-11 09:11:26 +08:00
mach-pxa
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-realview
ARM: realview: ensure visibility of writes during reset
2011-08-12 15:40:57 +01:00
mach-rpc
ARM: zImage: remove the static qualifier from global data variables
2011-05-07 00:08:02 -04:00
mach-s3c64xx
ARM: S3C64XX: Remove un-used code backlight code on SMDK6410
2011-09-15 13:59:58 +09:00
mach-s3c2400/include/mach
ARM: mach-s3c2400: delete
2011-07-18 10:59:26 -04:00
mach-s3c2410
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-s3c2412
Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:43:28 -07:00
mach-s3c2416
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:38:42 -07:00
mach-s3c2440
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
mach-s3c2443
ARM: S3C24XX: Add clkdev support
2011-07-20 19:11:29 +09:00
mach-s5p64x0
ARM: S5P64X0: Replace irq_gc_ack() with irq_gc_ack_set_bit()
2011-08-19 20:56:17 +09:00
mach-s5pc100
Merge branch 'next-samsung-clkdev-fix' into next-samsung-devel
2011-07-21 17:28:23 +09:00
mach-s5pv210
ARM: S5PV210: Fix build warning
2011-08-19 20:57:35 +09:00
mach-sa1100
mach-sa1100: fix PCI build problem
2011-08-10 16:00:48 +00:00
mach-shark
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-shmobile
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x
2011-08-29 13:37:17 -07:00
mach-spear3xx
ARM: Consolidate the clkdev header files
2011-07-19 18:09:45 +02:00
mach-spear6xx
ARM: Consolidate the clkdev header files
2011-07-19 18:09:45 +02:00
mach-tcc8k
clocksource: convert ARM 32-bit up counting clocksources
2011-05-23 18:04:51 +01:00
mach-tegra
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-u300
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:41:04 -07:00
mach-ux500
Merge branch 'stericsson/cleanup' into next/timer
2011-10-31 23:42:23 +01:00
mach-versatile
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
mach-vexpress
ARM: 7003/1: vexpress: Add clock definition for the SP805.
2011-08-24 09:45:21 +01:00
mach-vt8500
arm: mach-vt8500: add forgotten irq_data conversion
2011-07-07 14:35:25 +00:00
mach-w90x900
ARM: Consolidate the clkdev header files
2011-07-19 18:09:45 +02:00
mach-zynq
ARM: zynq: remove incorrectly deleted file
2011-07-28 16:02:53 +00:00
mm
ARM: 7088/1: entry: fix wrong parameter name used in do_thumb_abort
2011-09-10 23:39:56 +01:00
nwfpe
…
oprofile
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-02-15 10:18:48 -08:00
plat-iop
ARM: convert PCI defines to variables
2011-07-12 11:19:29 -05:00
plat-mxc
iMX: Fix build for iMX53
2011-08-08 08:38:45 +02:00
plat-nomadik
Merge branch 'stericsson/cleanup' into next/timer
2011-10-31 23:42:23 +01:00
plat-omap
Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer
2011-10-31 00:52:14 +01:00
plat-orion
genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)
2011-07-07 16:02:26 +00:00
plat-pxa
mmc: sdhci-pxa: move platform data to include/linux/platform_data
2011-07-20 17:20:52 -04:00
plat-s3c24xx
Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:43:28 -07:00
plat-s5p
ARM: S5P: fix bug in spdif_clk_get_rate
2011-08-19 21:21:08 +09:00
plat-samsung
ARM: SAMSUNG: fix to prevent declaring duplicated
2011-09-15 15:54:15 +09:00
plat-spear
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:12:10 -07:00
plat-tcc
ARM: Consolidate the clkdev header files
2011-07-19 18:09:45 +02:00
plat-versatile
ARM: consolidate SMP cross call implementation
2011-05-23 16:53:17 +01:00
tools
ARM: 7051/1: cpuimx* boards: fix mach-types errors
2011-08-22 15:57:22 +01:00
vfp
Merge branch 'devel-stable' into for-next
2011-07-22 23:09:07 +01:00
Kconfig
ARM: 7015/1: ARM errata: Possible cache data corruption with hit-under-miss enabled
2011-08-15 11:58:59 +01:00
Kconfig-nommu
Fix common misspellings
2011-03-31 11:26:23 -03:00
Kconfig.debug
lib: consolidate DEBUG_STACK_USAGE option
2011-05-25 08:39:54 -07:00
Makefile
Merge branch 'imx/dt' into next/dt
2011-07-28 15:25:46 +00:00