iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/arm
History
Arnd Bergmann 034ee29912 Merge branch 'depends/omap2_dss' into next/cleanup 
Omap cleanups conflicted with omap2_dss work in a nontrivial
way, this is the most logical fixup.

Conflicts:
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-ldp.c
	arch/arm/mach-omap2/board-rx51.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-10-31 23:17:39 +01:00
..
boot
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
common
ARM: gic: Allow gic arch extensions to provide irqchip flags
2011-09-23 12:05:30 +05:30
configs
arm: mx3: update defconfig
2011-10-09 11:44:31 +02:00
include/asm
Merge branch 'tegra/cleanup' into next/cleanup
2011-10-20 14:59:19 +02:00
kernel
Merge branch 'tegra/cleanup' into next/cleanup
2011-10-20 14:59:19 +02:00
lib
arm: remove "optimized" SHA1 routines
2011-08-07 14:07:03 -07:00
mach-at91
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
2011-09-16 21:45:16 +01:00
mach-bcmring
ARM: mach-bcmring: Setup consistent dma size at boot time
2011-08-22 12:00:12 +00:00
mach-clps711x
ARM: mach-clps711x: convert boot_params to atag_offset
2011-08-21 17:14:42 -04:00
mach-cns3xxx
Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stable
2011-09-21 08:48:33 +01:00
mach-davinci
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-dove
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-ebsa110
ARM: mach-ebsa110: convert boot_params to atag_offset
2011-08-21 17:14:45 -04:00
mach-ep93xx
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
2011-09-16 21:45:16 +01:00
mach-exynos4
Merge branch 'tegra/cleanup' into next/cleanup
2011-10-20 14:59:19 +02:00
mach-footbridge
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
2011-09-16 21:45:16 +01:00
mach-gemini
ARM: mach-gemini: convert boot_params to atag_offset
2011-08-21 17:14:48 -04:00
mach-h720x
ARM: mach-h720x: convert boot_params to atag_offset
2011-08-21 17:14:50 -04:00
mach-imx
Merge branch 'imx/cleanup' into next/cleanup
2011-10-20 18:32:28 +02:00
mach-integrator
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-iop13xx
ARM: mach-iop13xx: convert boot_params to atag_offset
2011-08-21 17:14:52 -04:00
mach-iop32x
ARM: mach-iop32x: convert boot_params to atag_offset
2011-08-21 17:14:53 -04:00
mach-iop33x
ARM: mach-iop33x: convert boot_params to atag_offset
2011-08-21 17:14:54 -04:00
mach-ixp4xx
ARM: mach-ixp4xx: convert boot_params to atag_offset
2011-08-21 17:14:56 -04:00
mach-ixp23xx
ARM: mach-ixp23xx: convert boot_params to atag_offset
2011-08-21 17:14:55 -04:00
mach-ixp2000
ARM: mach-ixp2000: convert boot_params to atag_offset
2011-08-21 17:14:54 -04:00
mach-kirkwood
ARM: mach-kirkwood: convert boot_params to atag_offset
2011-08-21 17:14:57 -04:00
mach-ks8695
ARM: mach-ks8695: convert boot_params to atag_offset
2011-08-21 17:14:58 -04:00
mach-l7200/include/mach
…
mach-lpc32xx
ARM: mach-lpc32xx: convert boot_params to atag_offset
2011-08-21 17:14:58 -04: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
ARM: mach-msm: convert boot_params to atag_offset
2011-08-21 17:14:59 -04:00
mach-mv78xx0
ARM: mach-mv78xx0: convert boot_params to atag_offset
2011-08-21 17:15:00 -04:00
mach-mx5
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-mxs
Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/cleanup
2011-10-20 18:32:02 +02:00
mach-netx
ARM: mach-netx: convert boot_params to atag_offset
2011-08-21 17:15:01 -04:00
mach-nomadik
ARM: mach-nomadik: convert boot_params to atag_offset
2011-08-21 17:15:02 -04:00
mach-nuc93x
ARM: mach-nuc93x: convert boot_params to atag_offset
2011-08-21 17:15:03 -04:00
mach-omap1
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-omap2
Merge branch 'depends/omap2_dss' into next/cleanup
2011-10-31 23:17:39 +01:00
mach-orion5x
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
2011-09-16 21:45:16 +01:00
mach-pnx4008
ARM: mach-pnx4008: convert boot_params to atag_offset
2011-08-21 17:15:06 -04:00
mach-prima2
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-pxa
ARM: mach-pxa: convert boot_params to atag_offset
2011-08-21 17:15:07 -04:00
mach-realview
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
2011-09-16 21:45:16 +01:00
mach-rpc
ARM: mach-rpc: convert boot_params to atag_offset
2011-08-21 17:15:09 -04:00
mach-s3c64xx
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-s3c2400/include/mach
ARM: mach-s3c2400: delete
2011-07-18 10:59:26 -04:00
mach-s3c2410
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-s3c2412
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-s3c2416
ARM: mach-s3c24*: convert boot_params to atag_offset
2011-08-21 17:15:09 -04:00
mach-s3c2440
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-s3c2443
Merge branch 'tegra/cleanup' into next/cleanup
2011-10-20 14:59:19 +02:00
mach-s5p64x0
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-s5pc100
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-s5pv210
Merge branch 'tegra/cleanup' into next/cleanup
2011-10-20 14:59:19 +02:00
mach-sa1100
ARM: mach-sa1100: convert boot_params to atag_offset
2011-08-21 17:15:13 -04:00
mach-shark
ARM: mach-shark: convert boot_params to atag_offset
2011-08-21 17:15:14 -04:00
mach-shmobile
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
2011-09-16 21:45:16 +01:00
mach-spear3xx
ARM: mach-spear*: convert boot_params to atag_offset
2011-08-21 17:15:15 -04:00
mach-spear6xx
ARM: mach-spear*: convert boot_params to atag_offset
2011-08-21 17:15:15 -04:00
mach-tcc8k
ARM: mach-tcc8k: convert boot_params to atag_offset
2011-08-21 17:15:15 -04:00
mach-tegra
Merge branch 'tegra/cleanup' into next/cleanup
2011-10-20 14:59:19 +02:00
mach-u300
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02:00
mach-ux500
Merge branch 'stericsson/fixes' into next/cleanup
2011-10-08 21:47:06 +02:00
mach-versatile
ARM: mach-versatile: convert boot-params to atag_offset
2011-08-21 17:15:19 -04:00
mach-vexpress
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
2011-09-16 21:45:16 +01:00
mach-vt8500
ARM: mach-vt8500: convert boot_params to atag_offset
2011-08-21 17:15:21 -04:00
mach-w90x900
ARM: mach-w90x900: remove useless boot_params entries
2011-08-21 17:15:22 -04:00
mach-zynq
ARM: zynq: remove incorrectly deleted file
2011-07-28 16:02:53 +00:00
mm
Merge branch 'tegra/cleanup' into next/cleanup
2011-10-20 14:59:19 +02: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
Merge branch 'imx/cleanup' into next/cleanup
2011-10-20 18:32:28 +02:00
plat-nomadik
mach-ux500: remove pull-pinconfig and add SPI2
2011-08-30 09:23:11 +02:00
plat-omap
Merge branch 'depends/rmk/devel-stable' into next/cleanup
2011-10-08 21:07:42 +02: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
ARM: SAMSUNG: Move map header file into plat-samsung
2011-09-16 20:20:33 +09:00
plat-s5p
Merge branch 'tegra/cleanup' into next/cleanup
2011-10-20 14:59:19 +02:00
plat-samsung
Merge branch 'sirf/cleanup' into next/cleanup
2011-10-07 23:07:41 +02: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
ARM: vfp: Fix the comment to make it consistent with the code.
2011-09-23 12:05:30 +05:30
Kconfig
Merge branch 'tegra/cleanup' into next/cleanup
2011-10-20 14:59:19 +02:00
Kconfig-nommu
Fix common misspellings
2011-03-31 11:26:23 -03:00
Kconfig.debug
ARM: kprobes: Add config option for selecting the ARM kprobes tests
2011-09-20 18:17:42 +00:00
Makefile
Merge branch 'imx/dt' into next/dt
2011-07-28 15:25:46 +00:00