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
blockcheck.c
blockcheck.h
buffer_head_io.c
buffer_head_io.h
dcache.c
dcache.h
dir.c	ocfs2: Initialize data_ac (might be used uninitialized)	2011-05-13 11:26:15 -07:00
dir.h
dlmglue.c
dlmglue.h
export.c
export.h
extent_map.c
extent_map.h
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
heartbeat.h
inode.c
inode.h
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
journal.c	ocfs2: Skip mount recovery for hard-ro mounts	2011-05-13 11:27:14 -07:00
journal.h
Kconfig
localalloc.c
localalloc.h
locks.c
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
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
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_lockingver.h
ocfs2_trace.h	ocfs2: Add trace event for trim.	2011-05-23 23:37:20 -07:00
ocfs2.h
quota_global.c
quota_local.c
quota.h
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
reservations.h
resize.c
resize.h
slot_map.c
slot_map.h
stack_o2cb.c
stack_user.c
stackglue.c
stackglue.h
suballoc.c
suballoc.h
super.c	more conservative S_NOSEC handling	2011-06-03 18:24:58 -04:00
super.h
symlink.c
symlink.h
sysfile.c
sysfile.h
uptodate.c
uptodate.h
ver.c
ver.h
xattr.c
xattr.h