Russell King 7e69a8c4d0 Merge branch 's3c-move' into devel ...

Conflicts:

	arch/arm/mach-versatile/core.c

2008-10-14 22:24:51 +01:00

..

asm

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-10-13 17:13:56 +01:00