summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-05-19 20:01:30 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-05-19 20:01:30 +0100
commit98e6f57ba030e489896314c5d4ae926346037ce9 (patch)
tree8fc15a42cc6e955f7a6db29dd82673c72833fba3 /kernel
parent150c9173031d43746d70582a17931350f3da8932 (diff)
parent7e36e2f5355ab87f8946041d044b34cda01e2077 (diff)
parent39091b101411f20f712743fe6f61ac5ca11b3f01 (diff)
parentb204d462d7eae31413c5ac80ec3a32a89765fd46 (diff)
Merge branches 'dyntick', 'ixp', 'rpc' and 'rtc' into devel