Linus Torvalds bac5e54c29 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 ... * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (38 commits) direct I/O fallback sync simplification ocfs: stop using do_sync_mapping_range cleanup blockdev_direct_IO locking make generic_acl slightly more generic sanitize xattr handler prototypes libfs: move EXPORT_SYMBOL for d_alloc_name vfs: force reval of target when following LAST_BIND symlinks (try #7) ima: limit imbalance msg Untangling ima mess, part 3: kill dead code in ima Untangling ima mess, part 2: deal with counters Untangling ima mess, part 1: alloc_file() O_TRUNC open shouldn't fail after file truncation ima: call ima_inode_free ima_inode_free IMA: clean up the IMA counts updating code ima: only insert at inode creation time ima: valid return code from ima_inode_alloc fs: move get_empty_filp() deffinition to internal.h Sanitize exec_permission_lite() Kill cached_lookup() and real_lookup() Kill path_lookup_open() ... Trivial conflicts in fs/direct-io.c		2009-12-16 12:04:02 -08:00
..
addr.c	IB/addr: Fix IPv6 routing lookup	2009-11-19 16:46:25 -08:00
agent.c
agent.h
cache.c
cm.c
cm_msgs.h
cma.c	IB/addr: Fix IPv6 routing lookup	2009-11-19 16:46:25 -08:00
core_priv.h
device.c
fmr_pool.c
iwcm.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
iwcm.h
mad.c	Merge branch 'mad' into for-linus	2009-09-10 21:19:45 -07:00
mad_priv.h	IB/mad: Allow tuning of QP0 and QP1 sizes	2009-09-07 08:28:48 -07:00
mad_rmpp.c	IB/mad: Fix lock-lock-timer deadlock in RMPP code	2009-09-23 11:10:15 -07:00
mad_rmpp.h
Makefile
multicast.c	IB/core: Fix send multicast group leave retry	2009-09-05 20:24:24 -07:00
packer.c
sa.h
sa_query.c	RDMA/ucma: Add option to manually set IB path	2009-11-16 09:30:33 -08:00
smi.c	IB/mad: Check hop count field in directed route MAD to avoid array overflow	2009-09-05 20:24:10 -07:00
smi.h
sysfs.c
ucm.c	headers: remove sched.h from poll.h	2009-10-04 15:05:10 -07:00
ucma.c	RDMA/cm: fix loopback address support	2009-11-19 13:26:06 -08:00
ud_header.c
umem.c
user_mad.c	headers: remove sched.h from poll.h	2009-10-04 15:05:10 -07:00
uverbs.h
uverbs_cmd.c	IB/uverbs: Fix return of PTR_ERR() of wrong pointer in ib_uverbs_get_context()	2009-12-09 14:30:44 -08:00
uverbs_main.c	switch alloc_file() to passing struct path	2009-12-16 12:16:42 -05:00
uverbs_marshall.c
verbs.c