Russell King 9759d22c83 Merge branch 'master' into devel ...

Conflicts:
	arch/arm/include/asm/elf.h
	arch/arm/kernel/module.c

2009-03-28 20:30:18 +00:00

..

asm

Merge branch 'master' into devel

2009-03-28 20:30:18 +00:00