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

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 1f0090a 3ba6e69)

commit	bd1274dc005c2cee41771a7cc616f4709a6e6323
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 16 Mar 2011 23:35:26 +0000 (16 23:35 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 16 Mar 2011 23:35:26 +0000 (16 23:35 +0000)
tree	fcfe103a499ca9e3d8fa0ecbca5b7d0d274da5ca	tree \| snapshot (tar.gz zip)
parent	1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd	commit \| diff
parent	3ba6e69ad887f8a814267ed36fd4bfbddf8855a9	commit \| diff

Merge branch 'v6v7' into devel

Conflicts:
arch/arm/include/asm/cacheflush.h
arch/arm/include/asm/proc-fns.h
arch/arm/mm/Kconfig

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/head.S	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/cacheflush.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/glue-cache.h	diff1 \|	\|	blob \| history
arch/arm/include/asm/glue-proc.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/Kconfig	diff1 \|	diff2 \|	blob \| history

Linux with added FPC-III support