diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-10-12 23:44:30 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-12 23:44:35 +0100 |
| commit | 92633b72d18ca4f25de1f28e436a882159491e7e (patch) | |
| tree | 8af578da7852d20c034a92c8919d6c6ca4f82da8 /arch/arm/mach-shark | |
| parent | 58273e553d3d2a6b1a302f1b79eb263190554345 (diff) | |
| parent | 06767fb2ba5af5542e2ec91e00e292ff93ab58ce (diff) | |
| parent | 8777297b5e5fb7f908b51b56548b7cf7dbbf2022 (diff) | |
Merge branches 'omap1-upstream' and 'omap2-upstream' into devel