]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 551a4fc 0c2b6a8)
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)
commitc3160d08f28272d2253603099e5dbb48946b775d
treeb1d6dac31a3a2836d24662139f21bb1ddc2522d3tree | snapshot
parent551a4fc8af9fb05130fd225e2723d2ac9551bdebcommit | diff
parent0c2b6a802c3f3e474192fb933168ed927f394376commit | 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.