| commit | 0588000eac9ba4178cebade437da3b28e8fad48f | [log] [tgz] |
|---|---|---|
| author | Alexander Graf <agraf@suse.de> | Wed Oct 31 13:36:18 2012 +0100 |
| committer | Alexander Graf <agraf@suse.de> | Wed Oct 31 13:36:18 2012 +0100 |
| tree | 697e514a0a0193f17a54f372dd18c5cd3927e154 | |
| parent | 8b5869ad85f703ffeb25e656eab826f6b85b984c [diff] | |
| parent | 81c52c56e2b43589091ee29038bcf793d3f184ab [diff] |
Merge commit 'origin/queue' into for-queue Conflicts: arch/powerpc/include/asm/Kbuild arch/powerpc/include/uapi/asm/Kbuild