git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8b5869a
81c52c5
)
Merge commit 'origin/queue' into for-queue
author
Alexander Graf
<agraf@suse.de>
Wed, 31 Oct 2012 12:36:18 +0000
(13:36 +0100)
committer
Alexander Graf
<agraf@suse.de>
Wed, 31 Oct 2012 12:36:18 +0000
(13:36 +0100)
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
Trivial merge