git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cf47b8f
ae1a25d
)
Merge branch 'linus' into core/locking
author
Ingo Molnar
<mingo@elte.hu>
Sat, 7 Feb 2009 17:31:54 +0000
(18:31 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Sat, 7 Feb 2009 17:31:54 +0000
(18:31 +0100)
Conflicts:
fs/btrfs/locking.c
Trivial merge