Linus Torvalds a44f99c7ef Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits) video: change to new flag variable scsi: change to new flag variable rtc: change to new flag variable rapidio: change to new flag variable pps: change to new flag variable net: change to new flag variable misc: change to new flag variable message: change to new flag variable memstick: change to new flag variable isdn: change to new flag variable ieee802154: change to new flag variable ide: change to new flag variable hwmon: change to new flag variable dma: change to new flag variable char: change to new flag variable fs: change to new flag variable xtensa: change to new flag variable um: change to new flag variables s390: change to new flag variable mips: change to new flag variable ... Fix up trivial conflict in drivers/hwmon/Makefile		2011-03-20 18:14:55 -07:00
..
cluster	Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block	2011-01-13 10:45:01 -08:00
dlm	fs: change to new flag variable	2011-03-17 14:02:57 +01:00
dlmfs	fs: change to new flag variable	2011-03-17 14:02:57 +01:00
acl.c	fs: provide rcu-walk aware permission i_ops	2011-01-07 17:50:29 +11:00
acl.h	fs: provide rcu-walk aware permission i_ops	2011-01-07 17:50:29 +11:00
alloc.c	ocfs2: Remove unused truncate function from alloc.c	2011-01-07 18:03:00 -08:00
alloc.h	ocfs2: Remove unused truncate function from alloc.c	2011-01-07 18:03:00 -08:00
aops.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2011-01-11 11:28:34 -08:00
aops.h	Ocfs2: Teach 'coherency=full' O_DIRECT writes to correctly up_read i_alloc_sem.	2010-12-09 15:36:48 -08:00
blockcheck.c
blockcheck.h
buffer_head_io.c
buffer_head_io.h
dcache.c	ocfs2: fix d_revalidate oopsen on NFS exports	2011-03-10 03:45:07 -05:00
dcache.h
dir.c	Kill off warning: ‘inline’ is not at beginning of declaration	2011-01-19 15:43:08 +01:00
dir.h
dlmglue.c
dlmglue.h
export.c	exportfs: Return the minimum required handle size	2011-03-14 09:15:28 -04:00
export.h
extent_map.c
extent_map.h
file.c	fallocate should be a file operation	2011-01-17 02:25:31 -05:00
file.h	fs: provide rcu-walk aware permission i_ops	2011-01-07 17:50:29 +11:00
heartbeat.c
heartbeat.h
inode.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
inode.h
ioctl.c
ioctl.h
journal.c
journal.h	ocfs2: Fix estimate of necessary credits for mkdir	2011-02-20 02:33:32 -08:00
Kconfig	ocfs2: Make OCFS2_FS depend on CONFIGFS_FS	2011-01-16 21:22:40 +00:00
localalloc.c
localalloc.h
locks.c
locks.h
Makefile	fs: change to new flag variable	2011-03-17 14:02:57 +01:00
mmap.c
mmap.h
namei.c	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next	2011-03-08 11:38:10 +11:00
namei.h
ocfs1_fs_compat.h
ocfs2_fs.h	ocfs2: Fix system inodes cache overflow.	2010-12-22 02:35:36 -08:00
ocfs2_ioctl.h	Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window	2010-10-15 13:03:09 -07:00
ocfs2_lockid.h
ocfs2_lockingver.h
ocfs2.h	ocfs2: Try to free truncate log when meeting ENOSPC in write.	2010-12-16 00:46:02 -08:00
quota_global.c	ocfs2: use system_wq instead of ocfs2_quota_wq	2011-02-01 11:42:42 +01:00
quota_local.c
quota.h	ocfs2: use system_wq instead of ocfs2_quota_wq	2011-02-01 11:42:42 +01:00
refcounttree.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2011-03-16 09:15:43 -07:00
refcounttree.h
reservations.c	ocfs2: Move 'wanted' into parens of ocfs2_resmap_resv_bits.	2010-09-23 14:16:47 -07:00
reservations.h
resize.c
resize.h
slot_map.c	When I tried to compile I got the following warning:	2010-10-11 13:45:52 -07: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
stackglue.h
suballoc.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
suballoc.h
super.c	Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-03-16 08:20:19 -07:00
super.h
symlink.c	ocfs2: Don't walk off the end of fast symlinks.	2010-09-29 17:33:05 -07:00
symlink.h
sysfile.c
sysfile.h
uptodate.c
uptodate.h
ver.c
ver.h
xattr.c	fs/vfs/security: pass last path component to LSM on inode creation	2011-02-01 11:12:29 -05:00
xattr.h	fs/vfs/security: pass last path component to LSM on inode creation	2011-02-01 11:12:29 -05:00