Linus Torvalds 6c51038900 Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block ... * 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits) Documentation/iostats.txt: bit-size reference etc. cfq-iosched: removing unnecessary think time checking cfq-iosched: Don't clear queue stats when preempt. blk-throttle: Reset group slice when limits are changed blk-cgroup: Only give unaccounted_time under debug cfq-iosched: Don't set active queue in preempt block: fix non-atomic access to genhd inflight structures block: attempt to merge with existing requests on plug flush block: NULL dereference on error path in __blkdev_get() cfq-iosched: Don't update group weights when on service tree fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away block: Require subsystems to explicitly allocate bio_set integrity mempool jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging fs: make fsync_buffers_list() plug mm: make generic_writepages() use plugging blk-cgroup: Add unaccounted time to timeslice_used. block: fixup plugging stubs for !CONFIG_BLOCK block: remove obsolete comments for blkdev_issue_zeroout. blktrace: Use rq->cmd_flags directly in blk_add_trace_rq. ... Fix up conflicts in fs/{aio.c,super.c}		2011-03-24 10:16:26 -07:00
..
acl.c	userns: rename is_owner_or_cap to inode_owner_or_capable	2011-03-23 19:47:13 -07:00
async-thread.c	Btrfs: don't walk around with task->state != TASK_RUNNING	2010-05-25 10:34:58 -04:00
async-thread.h	Btrfs: fix deadlock on async thread startup	2009-10-05 09:44:45 -04:00
btrfs_inode.h	btrfs: Allow to add new compression algorithm	2010-12-22 23:15:45 +08:00
compat.h	Btrfs: drop remaining LINUX_KERNEL_VERSION checks and compat code	2009-01-06 09:38:55 -05:00
compression.c	btrfs: Drop __exit attribute on btrfs_exit_compress	2011-02-06 07:19:19 -05:00
compression.h	btrfs: Extract duplicate decompress code	2010-12-22 23:15:50 +08:00
ctree.c	btrfs: check NULL or not	2011-01-16 11:30:20 -05:00
ctree.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-03-13 16:00:49 -07:00
delayed-ref.c	Btrfs: Integrate metadata reservation with start_transaction	2010-05-25 10:34:50 -04:00
delayed-ref.h	Btrfs: Integrate metadata reservation with start_transaction	2010-05-25 10:34:50 -04:00
dir-item.c	Btrfs: Fix variables set but not read (bugs found by gcc 4.6)	2010-10-29 15:14:31 -04:00
disk-io.c	Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block	2011-03-24 10:16:26 -07:00
disk-io.h	Btrfs: forced readonly mounts on errors	2011-01-17 15:13:08 -05:00
export.c	exportfs: Return the minimum required handle size	2011-03-14 09:15:28 -04:00
export.h	NFS support for btrfs - v3	2008-09-25 11:04:06 -04:00
extent_io.c	Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block	2011-03-24 10:16:26 -07:00
extent_io.h	Btrfs: fix fiemap bugs with delalloc	2011-02-23 16:23:20 -05:00
extent_map.c	Btrfs: check return value of alloc_extent_map()	2011-02-14 16:21:37 -05:00
extent_map.h	btrfs: Allow to add new compression algorithm	2010-12-22 23:15:45 +08:00
extent-tree.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-03-13 16:00:49 -07:00
file-item.c	Btrfs: do error checking in btrfs_del_csums	2011-01-28 16:42:34 -05:00
file.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-03-13 16:00:49 -07:00
free-space-cache.c	Btrfs: make sure search_bitmap finds something in remove_from_bitmap	2011-02-06 07:13:12 -05:00
free-space-cache.h	Btrfs: load free space cache if it exists	2010-10-29 09:26:35 -04:00
hash.h	Btrfs: remove crc32c.h and use libcrc32c directly.	2009-06-10 11:29:53 -04:00
inode-item.c	Btrfs: Integrate metadata reservation with start_transaction	2010-05-25 10:34:50 -04:00
inode-map.c	Btrfs: do not reuse objectid of deleted snapshot/subvol	2009-09-21 15:56:00 -04:00
inode.c	Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block	2011-03-24 10:16:26 -07:00
ioctl.c	userns: rename is_owner_or_cap to inode_owner_or_capable	2011-03-23 19:47:13 -07:00
ioctl.h	Merge branch 'lzo-support' of git://repo.or.cz/linux-btrfs-devel into btrfs-38	2011-01-16 11:25:54 -05:00
Kconfig	btrfs: Add lzo compression support	2010-12-22 23:15:47 +08:00
locking.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
locking.h	Btrfs: fix spinlock assertions on UP systems	2009-03-09 11:45:38 -04:00
lzo.c	Btrfs: Avoid accessing unmapped kernel address	2011-02-16 15:37:58 -05:00
Makefile	btrfs: Add lzo compression support	2010-12-22 23:15:47 +08:00
ordered-data.c	Btrfs: avoid uninit variable warnings in ordered-data.c	2011-01-31 20:33:37 -05:00
ordered-data.h	btrfs: Allow to add new compression algorithm	2010-12-22 23:15:45 +08:00
orphan.c	Btrfs: fixup return code for btrfs_del_orphan_item	2010-12-09 13:57:15 -05:00
print-tree.c	btrfs: fix missing break in switch phrase	2011-01-28 16:40:37 -05:00
print-tree.h	Btrfs: Create extent_buffer interface for large blocksizes	2008-09-25 11:03:56 -04:00
ref-cache.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ref-cache.h	Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL	2010-03-08 16:26:50 -05:00
relocation.c	Btrfs: allow balance to explicitly allocate chunks as it relocates	2011-02-16 15:28:47 -05:00
root-tree.c	Btrfs: cleanup warnings from gcc 4.6 (nonbugs)	2010-10-29 15:14:37 -04:00
struct-funcs.c	Btrfs: Fix checkpatch.pl warnings	2009-01-05 21:25:51 -05:00
super.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-02-25 14:03:39 -08:00
sysfs.c	Driver core: Constify struct sysfs_ops in struct kobj_type	2010-03-07 17:04:49 -08:00
transaction.c	btrfs: fix return value check of btrfs_join_transaction()	2011-01-28 16:40:37 -05:00
transaction.h	Btrfs: Add readonly snapshots support	2010-12-23 08:49:17 +08:00
tree-defrag.c	Btrfs: cleanup warnings from gcc 4.6 (nonbugs)	2010-10-29 15:14:37 -04:00
tree-log.c	btrfs: fix return value check of btrfs_start_transaction()	2011-02-01 07:17:27 -05:00
tree-log.h	Btrfs: Metadata ENOSPC handling for tree log	2010-05-25 10:34:53 -04:00
version.h	Update Btrfs files for in-kernel usage	2008-09-25 15:41:59 -04:00
version.sh	Btrfs: Fixes for 2.6.28-rc API changes	2008-11-19 21:17:22 -05:00
volumes.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
volumes.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-01-17 14:43:43 -08:00
xattr.c	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next	2011-03-08 11:38:10 +11:00
xattr.h	fs/vfs/security: pass last path component to LSM on inode creation	2011-02-01 11:12:29 -05:00
zlib.c	zlib: slim down zlib_deflate() workspace when possible	2011-03-22 17:44:17 -07:00