system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-27 06:50:51 +00:00
Code Issues 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
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
mach-clps711x
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
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
mach-h720x
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
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-ixp23xx
mach-ixp2000
mach-kirkwood
mach-ks8695
mach-l7200/include/mach
mach-lpc32xx
mach-mmp
mach-msm
mach-mv78xx0
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
mach-nomadik
mach-nuc93x
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
mach-prima2 Merge branch 'depends/rmk/devel-stable' into next/cleanup 2011-10-08 21:07:42 +02:00
mach-pxa
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
mach-s3c64xx Merge branch 'depends/rmk/devel-stable' into next/cleanup 2011-10-08 21:07:42 +02:00
mach-s3c2400/include/mach
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
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
mach-shark
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
mach-spear6xx
mach-tcc8k
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
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
mach-w90x900
mach-zynq
mm Merge branch 'tegra/cleanup' into next/cleanup 2011-10-20 14:59:19 +02:00
nwfpe
oprofile
plat-iop
plat-mxc Merge branch 'imx/cleanup' into next/cleanup 2011-10-20 18:32:28 +02:00
plat-nomadik
plat-omap Merge branch 'depends/rmk/devel-stable' into next/cleanup 2011-10-08 21:07:42 +02:00
plat-orion
plat-pxa
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
plat-tcc
plat-versatile
tools
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
Kconfig.debug ARM: kprobes: Add config option for selecting the ARM kprobes tests 2011-09-20 18:17:42 +00:00
Makefile