diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2013-09-26 14:42:43 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-09-26 14:42:43 +0200 |
commit | ce4899ded119f3607515cc54252c4bad7224f804 (patch) | |
tree | 11a74342f605c201dd5a43c9334f6b1ada2040d6 /microkernel | |
parent | 3c5a4ed72ec9e1f215a59c738161f18960a3670c (diff) | |
parent | e53c039152bdf699991d1c7b87cf9fd198b09591 (diff) | |
parent | 013774caef9034f5aca8fa8bd821b3aecf27389d (diff) |
Merge commit 'e53c039152bdf699991d1c7b87cf9fd198b09591'; commit '013774caef9034f5aca8fa8bd821b3aecf27389d' into HEAD