Kukjin Kim dc822e57ee ARM: EXYNOS4: Fix the merge conflict ... The mark of conflict should be removed. This happened at the commit fba9569924 ("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
..
alpha	alpha: wire up sendmmsg syscall	2011-10-31 17:30:51 -07:00
arm	ARM: EXYNOS4: Fix the merge conflict	2011-11-05 09:32:04 -07:00
avr32
blackfin	Blackfin: irq: remove IRQF_DISABLED	2011-10-26 04:22:26 -04:00
cris	kgdb: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
frv	kgdb: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
h8300	Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6	2011-10-29 07:27:45 -07:00
hexagon	Hexagon: Add basic stacktrace functionality for Hexagon architecture.	2011-11-01 07:34:21 -07:00
ia64	Merge branch 'process_vm' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux	2011-11-04 09:35:24 -07:00
m32r
m68k	Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block	2011-11-04 17:06:58 -07:00
microblaze	Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze	2011-10-31 16:13:44 -07:00
mips	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2011-11-03 13:28:14 -07:00
mn10300	kgdb: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
openrisc
parisc	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue	2011-10-28 10:49:34 -07:00
powerpc	Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block	2011-11-04 17:06:58 -07:00
s390	Merge branch 'akpm' (Andrew's incoming - part two)	2011-11-02 16:07:27 -07:00
score
sh	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
sparc	thp: share get_huge_page_tail()	2011-11-02 16:06:58 -07:00
tile	Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile	2011-11-04 12:33:34 -07:00
um	Merge branch 'for-linus' of git://github.com/richardweinberger/linux	2011-11-02 09:45:39 -07:00
unicore32
x86	Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6	2011-11-03 09:40:51 -07:00
xtensa	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
.gitignore
Kconfig