Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) fs: Merge split strings treewide: fix potentially dangerous trailing ';' in #defined values/expressions uwb: Fix misspelling of neighbourhood in comment net, netfilter: Remove redundant goto in ebt_ulog_packet trivial: don't touch files that are removed in the staging tree lib/vsprintf: replace link to Draft by final RFC number doc: Kconfig: `to be' -> `be' doc: Kconfig: Typo: square -> squared doc: Konfig: Documentation/power/{pm => apm-acpi}.txt drivers/net: static should be at beginning of declaration drivers/media: static should be at beginning of declaration drivers/i2c: static should be at beginning of declaration XTENSA: static should be at beginning of declaration SH: static should be at beginning of declaration MIPS: static should be at beginning of declaration ARM: static should be at beginning of declaration rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check Update my e-mail address PCIe ASPM: forcedly -> forcibly gma500: push through device driver tree ... Fix up trivial conflicts: - arch/arm/mach-ep93xx/dma-m2p.c (deleted) - drivers/gpio/gpio-ep93xx.c (renamed and context nearby) - drivers/net/r8169.c (just context changes)		2011-07-25 13:56:39 -07:00
..
cluster	ocfs2: remove the /sys/o2cb symlink	2011-05-23 23:37:14 -07:00
dlm	ocfs2/dlm: Do not migrate resource to a node that is leaving the domain	2011-05-25 21:05:22 -07:00
dlmfs	ocfs2: change incorrect 'extern' keyword to 'static' in dlmfs	2011-05-23 23:59:40 -07:00
acl.c	fs: take the ACL checks to common code	2011-07-25 14:30:23 -04:00
acl.h	fs: take the ACL checks to common code	2011-07-25 14:30:23 -04:00
alloc.c	ocfs2: Add trace event for trim.	2011-05-23 23:37:20 -07:00
alloc.h	ocfs2: Add ocfs2_trim_fs for SSD trim support.	2011-05-23 23:37:18 -07:00
aops.c	fs: move inode_dio_done to the end_io handler	2011-07-20 20:47:50 -04:00
aops.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
blockcheck.c	ocfs2: Fix metaecc error messages	2010-09-08 14:25:53 +08:00
blockcheck.h	ocfs2: Add statistics for the checksum and ecc operations.	2009-06-03 19:15:36 -07:00
buffer_head_io.c	ocfs2: Remove masklog ML_UPTODATE.	2011-02-24 16:22:20 +08:00
buffer_head_io.h	ocfs2: Take the inode out of the metadata read/write paths.	2009-09-04 16:07:48 -07:00
dcache.c	ocfs2: fix d_revalidate oopsen on NFS exports	2011-03-10 03:45:07 -05:00
dcache.h	Track negative entries v3	2010-09-10 09:18:15 -07:00
dir.c	ocfs2: Initialize data_ac (might be used uninitialized)	2011-05-13 11:26:15 -07:00
dir.h	ocfs2: Introduce dir free space list	2009-04-03 11:39:16 -07:00
dlmglue.c	Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge-window-fix	2011-03-28 09:44:26 -07:00
dlmglue.h	ocfs2: Fix lockdep warning in reflink.	2010-09-10 09:19:06 -07:00
export.c	exportfs: Return the minimum required handle size	2011-03-14 09:15:28 -04:00
export.h
extent_map.c	ocfs2: Remove masklog ML_EXTENT_MAP.	2011-02-22 22:27:33 +08:00
extent_map.h	ocfs2: Return extent flags for xattr value tree.	2009-09-22 20:09:39 -07:00
file.c	fs: take the ACL checks to common code	2011-07-25 14:30:23 -04:00
file.h	->permission() sanitizing: don't pass flags to ->permission()	2011-07-20 01:43:24 -04:00
heartbeat.c	ocfs2: Remove mlog(0) from fs/ocfs2/heartbeat.c	2011-02-23 21:17:39 +08:00
heartbeat.h
inode.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
inode.h	Track negative entries v3	2010-09-10 09:18:15 -07:00
ioctl.c	Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window	2011-05-25 21:51:55 -07:00
ioctl.h	Ocfs2: Move ocfs2 ioctl definitions from ocfs2_fs.h to newly added ocfs2_ioctl.h	2010-03-02 14:10:20 -08:00
journal.c	ocfs2: Skip mount recovery for hard-ro mounts	2011-05-13 11:27:14 -07:00
journal.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig	ocfs2: Make OCFS2_FS depend on CONFIGFS_FS	2011-01-16 21:22:40 +00:00
localalloc.c	ocfs2: Remove EXIT from masklog.	2011-03-07 16:43:21 +08:00
localalloc.h	ocfs2: increase the default size of local alloc windows	2010-05-05 18:18:07 -07:00
locks.c	ocfs2: remove INODE from unused files.	2011-02-21 11:18:23 +08:00
locks.h
Makefile	Ocfs2/move_extents: Add basic framework and source files for extent moving.	2011-05-25 15:17:08 +08:00
mmap.c	ocfs2: Remove FILE_IO from masklog.	2011-02-22 21:59:46 +08:00
mmap.h
move_extents.c	treewide: remove duplicate includes	2011-06-20 16:08:19 +02:00
move_extents.h	Ocfs2/move_extents: move/defrag extents within a certain range.	2011-05-25 15:17:12 +08:00
namei.c	fs: take the ACL checks to common code	2011-07-25 14:30:23 -04:00
namei.h	ocfs2: Create reflinked file in orphan dir.	2009-09-22 20:09:48 -07:00
ocfs1_fs_compat.h
ocfs2_fs.h	Revert wrong fixes for common misspellings	2011-04-26 23:31:11 -07:00
ocfs2_ioctl.h	Ocfs2/move_extents: Adding new ioctl code 'OCFS2_IOC_MOVE_EXT' to ocfs2.	2011-05-25 15:17:08 +08:00
ocfs2_lockid.h	ocfs2: Add new refcount tree lock resource in dlmglue.	2009-09-22 20:09:28 -07:00
ocfs2_lockingver.h	ocfs2_dlmfs: Enable the use of user cluster stacks.	2010-02-26 15:41:18 -08:00
ocfs2_trace.h	ocfs2: Add trace event for trim.	2011-05-23 23:37:20 -07:00
ocfs2.h	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2011-03-28 13:03:31 -07:00
quota_global.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
quota_local.c	ocfs2: Remove mlog(0) from quota_local.c.	2011-02-23 22:12:48 +08:00
quota.h	ocfs2: use system_wq instead of ocfs2_quota_wq	2011-02-01 11:42:42 +01:00
refcounttree.c	new helpers: kern_path_create/user_path_create	2011-07-20 01:44:05 -04:00
refcounttree.h	Ocfs2/refcounttree: Publicize couple of funcs from refcounttree.c	2011-05-25 15:17:08 +08:00
reservations.c	ocfs2: Remove masklog ML_RESERVATIONS.	2011-02-23 22:10:56 +08:00
reservations.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
resize.c	ocfs2: Remove mlog(0) from fs/ocfs2/suballoc.c	2011-02-22 08:24:01 +08:00
resize.h
slot_map.c	ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.c	2011-02-22 22:29:08 +08:00
slot_map.h
stack_o2cb.c	ocfs2: Print message if user mounts without starting global heartbeat	2010-10-06 17:55:29 -07:00
stack_user.c	ocfs2_connection_find() returns pointer to bad structure	2010-11-18 15:41:41 -08:00
stackglue.c	ocfs2_dlmfs: Enable the use of user cluster stacks.	2010-02-26 15:41:18 -08:00
stackglue.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
suballoc.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
suballoc.h	ocfs2: allow return of new inode block location before allocation of the inode	2010-09-08 14:25:59 +08:00
super.c	more conservative S_NOSEC handling	2011-06-03 18:24:58 -04:00
super.h	ocfs2: Wrap signal blocking in void functions.	2010-05-10 11:50:10 -07:00
symlink.c	ocfs2: Remove EXIT from masklog.	2011-03-07 16:43:21 +08:00
symlink.h
sysfile.c	ocfs2: Remove mlog(0) from fs/ocfs2/file.c	2011-02-22 22:14:41 +08:00
sysfile.h
uptodate.c	ocfs2: Remove masklog ML_UPTODATE.	2011-02-24 16:22:20 +08:00
uptodate.h	ocfs2: Pass struct ocfs2_caching_info to the journal functions.	2009-09-04 16:07:50 -07:00
ver.c
ver.h
xattr.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
xattr.h	fs/vfs/security: pass last path component to LSM on inode creation	2011-02-01 11:12:29 -05:00