Public Git Hosting - linux/fpc-iii.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 2472f3c 10a8c38)

commit	1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 16 Mar 2011 23:35:25 +0000 (16 23:35 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 16 Mar 2011 23:35:25 +0000 (16 23:35 +0000)
tree	c685060f260410e6704c9dfd457ed8c347141f1d	tree \| snapshot (tar.gz zip)
parent	2472f3c8d8fc18b25b2cf1574c036e238187c0ff	commit \| diff
parent	10a8c3839810ac9af1aec836d61b92e7a879f5fa	commit \| diff

Merge branch 'misc' into devel

Conflicts:
arch/arm/Kconfig

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/head.S	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/module.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/cache-l2x0.c	diff1 \|	diff2 \|	blob \| history

Linux with added FPC-III support