| commit | 9759d22c8348343b0da4e25d6150c41712686c14 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Sat Mar 28 20:30:18 2009 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sat Mar 28 20:30:18 2009 +0000 |
| tree | 338b185f11d705258888a8f2318a3a3b7ea0968d | |
| parent | ed40d0c472b136682b2fcba05f89762859c7374f [diff] | |
| parent | f0bba9f934517533acbda7329be93f55d5a01c03 [diff] |
Merge branch 'master' into devel Conflicts: arch/arm/include/asm/elf.h arch/arm/kernel/module.c