| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Aug 10 23:17:52 2010 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Aug 10 23:17:52 2010 +0100 |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc [diff] | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc [diff] |
Merge branches 'master' and 'devel' into for-linus Conflicts: arch/arm/Kconfig arch/arm/mm/Kconfig