Merge branch 'master' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 28 Mar 2009 20:30:18 +0000 (20:30 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 28 Mar 2009 20:30:18 +0000 (20:30 +0000)
commit9759d22c8348343b0da4e25d6150c41712686c14
tree338b185f11d705258888a8f2318a3a3b7ea0968d
parented40d0c472b136682b2fcba05f89762859c7374f
parentf0bba9f934517533acbda7329be93f55d5a01c03
Merge branch 'master' into devel

Conflicts:
arch/arm/include/asm/elf.h
arch/arm/kernel/module.c
arch/arm/include/asm/elf.h
arch/arm/kernel/module.c
arch/arm/mm/mmu.c
drivers/scsi/arm/cumana_2.c