]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 62a2ffa 5138812)
Merge branch 'for-chris' of http://git.kernel.org/pub/scm/linux/kernel/git/josef...
authorChris Mason <chris.mason@oracle.com>
Thu, 15 Dec 2011 18:43:49 +0000 (13:43 -0500)
committerChris Mason <chris.mason@oracle.com>
Thu, 15 Dec 2011 18:43:49 +0000 (13:43 -0500)
commitf0f8e05e014cb028a62e9d11af77483c831f4cd2
treeb1d6dac31a3a2836d24662139f21bb1ddc2522d3tree | snapshot
parent62a2ffa4a68782034949bf232c093df46e2b7d9ccommit | diff
parent513881295a6eac77ba66bd41f382483fe2240aedcommit | diff
Merge branch 'for-chris' of http://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work into integration

Conflicts:
fs/btrfs/inode.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/async-thread.c diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.c diff1 | diff2 | blob | history
fs/btrfs/super.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.