git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e4e1118
d50f2ab
)
Merge branch 'for_linus' into for_linus_merged
author
Theodore Ts'o
<tytso@mit.edu>
Tue, 10 Jan 2012 16:54:07 +0000
(11:54 -0500)
committer
Theodore Ts'o
<tytso@mit.edu>
Tue, 10 Jan 2012 16:54:07 +0000
(11:54 -0500)
Conflicts:
fs/ext4/ioctl.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff