diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-29 21:31:06 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-29 21:31:06 +0100 |
| commit | 92794a5d6359f9e8ed0d43fe0f3c653f748dcc90 (patch) | |
| tree | ff9e1e49639c657c72d848f891f8f1b44de7a541 /block | |
| parent | 681587c58639444215a7c88f7471819997d2f226 (diff) | |
| parent | 7883938b0d5ee8dd6381e1e2a9f71254252fd504 (diff) | |
| parent | b46926bb2d9977799c88aef17a4386ee02c326d8 (diff) | |
Merge branches 'pxa' and 'orion-fixes1'