| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jan 06 22:31:35 2011 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jan 06 22:32:03 2011 +0000 |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 [diff] | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 [diff] |
Merge branch 'smp' into misc Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c