Pandora Sourcecodes - pandora-kernel.git/commit - sound/core/pcm_lib.c

git.openpandora.org / pandora-kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 531f4b1 5da6fcb)

author	Chris Mason <chris.mason@oracle.com>
	Sun, 6 Nov 2011 08:07:10 +0000 (03:07 -0500)
committer	Chris Mason <chris.mason@oracle.com>
	Sun, 6 Nov 2011 08:07:10 +0000 (03:07 -0500)
commit	806468f8bf76a3cb2b626dd282946a6c9c0a50f0
tree	2de54229a5623756417a9bad7f426a2e8b06cad7	tree \| snapshot
parent	531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3	commit \| diff
parent	5da6fcbc4eb50c0f55d520750332f5a6ab13508c	commit \| diff

Merge git://git.jan-o-sch.net/btrfs-unstable into integration

Conflicts:
fs/btrfs/Makefile
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/scrub.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>

fs/btrfs/Makefile	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent-tree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/reada.c	diff1 \|	\|	blob \| history
fs/btrfs/scrub.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.h	diff1 \|	diff2 \|	blob \| history

Pandora Kernel Repository