]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e755d9a e65cbb9)
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)
commit567a45e917343c952806bb9f5c19aab0139bd519
treeb1d6dac31a3a2836d24662139f21bb1ddc2522d3tree | snapshot
parente755d9ab387c4c2401dce5b6f435432a829f41cbcommit | diff
parente65cbb94e036058128a5dec6398be2fd64cf88bacommit | 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 for KaRo TX COM modules