Changeset 2b95d13 in mainline for kernel/genarch/include/genarch/drivers/i8042/i8042.h

Timestamp:

2013-03-12T21:07:15Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

606f6a1

Parents:

976c434 (diff), eceff5f (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/genarch/include/genarch/drivers/i8042/i8042.h (moved) (moved from kernel/genarch/include/drivers/i8042/i8042.h )