iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/arm
History
Kukjin Kim dc822e57ee ARM: EXYNOS4: Fix the merge conflict 
The mark of conflict should be removed.

This happened at the commit fba9569924e0 ("Merge branch 'next' of
git://git.infradead.org/users/vkoul/slave-dma")

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
[ I always check the conflict resolution with "git diff" before I add
  the result, but I clearly missed that this time, and didn't notice the
  second conflict in that file after having fixed the first one.
  Oops, my bad.      - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-05 09:32:04 -07:00
..
boot
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
common
Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:02:35 -07:00
configs
Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:31:25 -07:00
include/asm
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2011-11-04 18:02:25 -07:00
kernel
Merge branch 'highbank/soc' into next/soc
2011-11-02 02:46:10 +01:00
lib
Merge branch 'misc' into for-linus
2011-10-25 08:19:59 +01:00
mach-at91
Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:02:35 -07:00
mach-bcmring
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-clps711x
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-cns3xxx
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-davinci
Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:31:25 -07:00
mach-dove
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-ebsa110
Merge branch 'dt/gic' into highbank/soc
2011-10-31 14:11:34 +01:00
mach-ep93xx
Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:25:36 -07:00
mach-exynos4
ARM: EXYNOS4: Fix the merge conflict
2011-11-05 09:32:04 -07:00
mach-footbridge
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-gemini
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-h720x
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-highbank
ARM: highbank: add suspend support
2011-10-31 14:14:05 +01:00
mach-imx
Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6
2011-11-03 09:40:51 -07:00
mach-integrator
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-iop13xx
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-iop32x
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-iop33x
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-ixp4xx
Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:25:36 -07:00
mach-ixp23xx
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-ixp2000
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-kirkwood
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-ks8695
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-l7200/include/mach
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-lpc32xx
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-mmp
Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 19:55:06 -07:00
mach-msm
Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:02:35 -07:00
mach-mv78xx0
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-mx5
Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6
2011-11-03 09:40:51 -07:00
mach-mxs
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:34:22 -07:00
mach-netx
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-nomadik
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-omap1
Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:58:25 -07:00
mach-omap2
Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6
2011-11-03 09:40:51 -07:00
mach-orion5x
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-picoxcell
picoxcell: add a definition of VMALLOC_END
2011-10-04 21:25:10 +01:00
mach-pnx4008
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-prima2
Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:22:01 -07:00
mach-pxa
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2011-11-04 07:58:25 -07:00
mach-realview
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:34:22 -07:00
mach-rpc
Merge branch 'dt/gic' into highbank/soc
2011-10-31 14:11:34 +01:00
mach-s3c64xx
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2011-11-04 18:02:25 -07:00
mach-s3c2410
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2011-11-04 18:02:25 -07:00
mach-s3c2412
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2011-11-04 18:02:25 -07:00
mach-s3c2416
Merge branch 'dt/gic' into next/dt
2011-10-31 14:08:10 +01:00
mach-s3c2440
Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:11:00 -07:00
mach-s3c2443
Merge branch 'depends/rmk/memory_h' into next/cleanup2
2011-11-01 13:47:27 +01:00
mach-s5p64x0
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2011-11-04 18:02:25 -07:00
mach-s5pc100
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2011-11-04 18:02:25 -07:00
mach-s5pv210
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2011-11-04 18:02:25 -07:00
mach-sa1100
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-shark
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-shmobile
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2011-11-04 07:58:25 -07:00
mach-spear3xx
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-spear6xx
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-tcc8k
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mach-tegra
Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:31:25 -07:00
mach-u300
Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6
2011-11-03 09:40:51 -07:00
mach-ux500
Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6
2011-11-03 09:40:51 -07:00
mach-versatile
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-vexpress
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:34:22 -07:00
mach-vt8500
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-w90x900
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
mach-zynq
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
mm
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
nwfpe
…
oprofile
…
plat-iop
ARM: convert PCI defines to variables
2011-07-12 11:19:29 -05:00
plat-mxc
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
plat-nomadik
Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:18:05 -07:00
plat-omap
Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:58:25 -07:00
plat-orion
ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
2011-08-24 08:29:20 +01:00
plat-pxa
Merge branch 'depends/rmk/gpio' into next/fixes
2011-10-31 22:44:18 +01:00
plat-s3c24xx
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2011-11-04 18:02:25 -07:00
plat-s5p
Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 20:25:36 -07:00
plat-samsung
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2011-11-04 18:02:25 -07:00
plat-spear
Merge branch 'depends/rmk/memory_h' into next/fixes
2011-11-01 00:25:01 +01:00
plat-tcc
ARM: plat-tcc: remove mach/memory.h
2011-10-13 12:49:42 -04:00
plat-versatile
ARM: versatile: convert logical CPU numbers to physical numbers
2011-10-17 10:01:11 +01:00
tools
ARM: Add a few machine types to mach-types
2011-10-17 13:28:46 +01:00
vfp
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2011-10-28 12:02:27 -07:00
Kconfig
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
Kconfig-nommu
Fix common misspellings
2011-03-31 11:26:23 -03:00
Kconfig.debug
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00
Makefile
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
2011-11-01 21:08:03 -07:00