| commit | 2502991560dc8244dbe10e48473d85722c1e2ec1 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Wed Oct 15 23:16:07 2008 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Wed Oct 15 23:16:07 2008 +0100 |
| tree | 63b1f3be2ed56ff06f1e8db709e4ce85d69c3add | |
| parent | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 [diff] | |
| parent | a9ff8f6462635c8d9f8d64b7b10ddcea8404d77b [diff] |
Merge branch 'fixes' into for-linus Conflicts: arch/arm/mach-versatile/core.c