git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c06a0e1
7a26285
)
Merge branch 'for-chris' of git://github.com/sensille/linux into integration
author
Chris Mason
<chris.mason@oracle.com>
Sun, 6 Nov 2011 08:05:08 +0000
(
03:05
-0500)
committer
Chris Mason
<chris.mason@oracle.com>
Sun, 6 Nov 2011 08:05:08 +0000
(
03:05
-0500)
Conflicts:
fs/btrfs/ctree.h
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff