Changeset 12573db in mainline for kernel/generic/include/ipc/ipc.h

Timestamp:

2011-01-31T20:32:33Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

37cf3792

Parents:

4fe94c66 (diff), 197ef43 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/include/ipc/ipc.h (modified) (2 diffs)

kernel/generic/include/ipc/ipc.h

@@ -338 +338 @@
          * The caller box is different from sender->answerbox
          * for synchronous calls.
-         *
          */
         answerbox_t *callerbox;
@@ -355 +354 @@
          * cases, we must keep it aside so that the answer is processed
          * correctly.
-         *
          */
         phone_t *caller_phone;