]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c06a0e1 7a26285)
Merge branch 'for-chris' of git://github.com/sensille/linux into integration
authorChris Mason <chris.mason@oracle.com>
Sun, 6 Nov 2011 08:05:08 +0000 (03:05 -0500)
committerChris Mason <chris.mason@oracle.com>
Sun, 6 Nov 2011 08:05:08 +0000 (03:05 -0500)
commit531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3
tree63efdfe9b192243fefb76be3921b9a2aaa26291etree
parentc06a0e120a4e381a1c291c1fce3c6155c5791caecommit | diff
parent7a26285eea8eb92e0088db011571d887d4551b0fcommit | diff
Merge branch 'for-chris' of git://github.com/sensille/linux into integration

Conflicts:
fs/btrfs/ctree.h

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/ctree.h diff1 | diff2 | blob | history
fs/btrfs/disk-io.c diff1 | diff2 | blob | history
fs/btrfs/disk-io.h diff1 | diff2 | blob | history
fs/btrfs/extent_io.c diff1 | diff2 | blob | history
fs/btrfs/extent_io.h diff1 | diff2 | blob | history
fs/btrfs/scrub.c diff1 | diff2 | blob | history
fs/btrfs/volumes.c diff1 | diff2 | blob | history
Ubuntu Disco kernel mirror for Proxmox VE and PMG