Linus Torvalds 714f83d5d9 Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits) tracing, net: fix net tree and tracing tree merge interaction tracing, powerpc: fix powerpc tree and tracing tree interaction ring-buffer: do not remove reader page from list on ring buffer free function-graph: allow unregistering twice trace: make argument 'mem' of trace_seq_putmem() const tracing: add missing 'extern' keywords to trace_output.h tracing: provide trace_seq_reserve() blktrace: print out BLK_TN_MESSAGE properly blktrace: extract duplidate code blktrace: fix memory leak when freeing struct blk_io_trace blktrace: fix blk_probes_ref chaos blktrace: make classic output more classic blktrace: fix off-by-one bug blktrace: fix the original blktrace blktrace: fix a race when creating blk_tree_root in debugfs blktrace: fix timestamp in binary output tracing, Text Edit Lock: cleanup tracing: filter fix for TRACE_EVENT_FORMAT events ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release() x86: kretprobe-booster interrupt emulation code fix ... Fix up trivial conflicts in arch/parisc/include/asm/ftrace.h include/linux/memory.h kernel/extable.c kernel/module.c		2009-04-05 11:04:19 -07:00
..
9p
adfs	fs/adfs: return f_fsid for statfs(2)	2009-04-02 19:05:08 -07:00
affs	fs/affs: return f_fsid for statfs(2)	2009-04-02 19:05:08 -07:00
afs	FS-Cache: Make kAFS use FS-Cache	2009-04-03 16:42:41 +01:00
autofs
autofs4	autofs4: fix lookup deadlock	2009-04-01 08:59:23 -07:00
befs	fs/befs: return f_fsid for statfs(2)	2009-04-02 19:05:08 -07:00
bfs
btrfs	Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2009-04-03 15:14:44 -07:00
cachefiles	CacheFiles: A cache that backs onto a mounted filesystem	2009-04-03 16:42:41 +01:00
cifs
coda
configfs
cramfs	fs/cramfs: return f_fsid for statfs(2)	2009-04-02 19:05:08 -07:00
debugfs
devpts
dlm
ecryptfs	ecryptfs: use kzfree()	2009-04-01 08:59:23 -07:00
efs	fs/efs: return f_fsid for statfs(2)	2009-04-02 19:05:09 -07:00
exofs
exportfs
ext2
ext3	Merge branch 'ext3-latency-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4	2009-04-03 11:10:33 -07:00
ext4	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
fat	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2009-04-02 21:09:10 -07:00
freevxfs
fscache	FS-Cache: Implement data I/O part of netfs API	2009-04-03 16:42:39 +01:00
fuse	fuse: allow private mappings of "direct_io" files	2009-04-02 14:25:35 +02:00
gfs2	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2009-04-02 21:09:10 -07:00
hfs	fs/hfs: return f_fsid for statfs(2)	2009-04-02 19:05:09 -07:00
hfsplus	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2009-04-02 21:09:10 -07:00
hostfs
hpfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2009-04-02 21:09:10 -07:00
hppfs	hppfs: hppfs_read_file() may return -ERROR	2009-04-02 19:04:53 -07:00
hugetlbfs
isofs	fs/isofs: return f_fsid for statfs(2)	2009-04-02 19:05:09 -07:00
jbd	Merge branch 'ext3-latency-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4	2009-04-03 11:10:33 -07:00
jbd2
jffs2
jfs
lockd	NSM: Fix unaligned accesses in nsm_init_private()	2009-04-01 13:24:14 -04:00
minix	fs/minix: return f_fsid for statfs(2)	2009-04-02 19:05:09 -07:00
ncpfs
nfs	NFS: Add mount options to enable local caching on NFS	2009-04-03 16:42:48 +01:00
nfs_common
nfsd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2009-04-02 21:09:10 -07:00
nls
notify
ntfs
ocfs2	ocfs2: recover orphans in offline slots during recovery and mount	2009-04-03 11:39:26 -07:00
omfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2009-04-02 21:09:10 -07:00
openpromfs
partitions	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
proc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
qnx4	fs/qnx4: return f_fsid for statfs(2)	2009-04-02 19:05:10 -07:00
quota	vfs: skip I_CLEAR state inodes	2009-04-02 19:04:48 -07:00
ramfs	ramfs: add support for "mode=" mount option	2009-04-01 08:59:22 -07:00
reiserfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2009-04-02 21:09:10 -07:00
romfs
smbfs
squashfs	fs/squashfs: return f_fsid for statfs(2)	2009-04-02 19:05:10 -07:00
sysfs
sysv	fs/sysv: return f_fsid for statfs(2)	2009-04-02 19:05:10 -07:00
ubifs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
udf	udf: Don't write integrity descriptor too often	2009-04-02 13:36:28 +02:00
ufs	fs/ufs: return f_fsid for statfs(2)	2009-04-02 19:05:10 -07:00
xfs	Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs	2009-04-03 09:52:29 -07:00
aio.c
anon_inodes.c
attr.c
bad_inode.c
binfmt_aout.c
binfmt_elf_fdpic.c	bin_elf_fdpic: check the return value of clear_user	2009-04-02 19:05:01 -07:00
binfmt_elf.c
binfmt_em86.c
binfmt_flat.c
binfmt_misc.c
binfmt_script.c
binfmt_som.c
bio-integrity.c
bio.c
block_dev.c
buffer.c	Merge branch 'ext3-latency-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4	2009-04-03 11:10:33 -07:00
char_dev.c
compat_binfmt_elf.c
compat_ioctl.c	Merge branch 'for-linus' of git://neil.brown.name/md	2009-04-03 09:08:19 -07:00
compat.c	Make non-compat preadv/pwritev use native register size	2009-04-04 14:20:34 -07:00
dcache.c
dcookies.c
direct-io.c
drop_caches.c	vfs: skip I_CLEAR state inodes	2009-04-02 19:04:48 -07:00
eventfd.c	epoll keyed wakeups: make eventfd use keyed wakeups	2009-04-01 08:59:20 -07:00
eventpoll.c	epoll keyed wakeups: teach epoll about hints coming with the wakeup key	2009-04-01 08:59:20 -07:00
exec.c
fcntl.c
fifo.c
file_table.c
file.c
filesystems.c
fs_struct.c
fs-writeback.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
generic_acl.c
inode.c
internal.h
ioctl.c
ioprio.c
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-fscache	2009-04-03 10:07:43 -07:00
Kconfig.binfmt
libfs.c
locks.c
Makefile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-fscache	2009-04-03 10:07:43 -07:00
mbcache.c
mpage.c
namei.c
namespace.c
nfsctl.c
no-block.c
open.c
pipe.c
pnode.c
pnode.h
posix_acl.c
read_write.c	Make non-compat preadv/pwritev use native register size	2009-04-04 14:20:34 -07:00
read_write.h
readdir.c
select.c
seq_file.c
signalfd.c
splice.c	FS-Cache: Recruit a page flags for cache management	2009-04-03 16:42:36 +01:00
stack.c
stat.c
super.c	CacheFiles: Export things for CacheFiles	2009-04-03 16:42:40 +01:00
sync.c
timerfd.c
utimes.c
xattr_acl.c
xattr.c