diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-05-19 20:01:30 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-05-19 20:01:30 +0100 |
commit | 98e6f57ba030e489896314c5d4ae926346037ce9 (patch) | |
tree | 8fc15a42cc6e955f7a6db29dd82673c72833fba3 /kernel | |
parent | 150c9173031d43746d70582a17931350f3da8932 (diff) | |
parent | 7e36e2f5355ab87f8946041d044b34cda01e2077 (diff) | |
parent | 39091b101411f20f712743fe6f61ac5ca11b3f01 (diff) | |
parent | b204d462d7eae31413c5ac80ec3a32a89765fd46 (diff) |
Merge branches 'dyntick', 'ixp', 'rpc' and 'rtc' into devel