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
Kconfig	ocfs2: Make OCFS2_FS depend on CONFIGFS_FS	2011-01-16 21:22:40 +00:00
Makefile	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	ocfs2: Fix metaecc error messages	2010-09-08 14:25:53 +08:00
blockcheck.h	…
buffer_head_io.c	Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes	2010-04-30 13:37:29 -07: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	Kill off warning: ‘inline’ is not at beginning of declaration	2011-01-19 15:43:08 +01:00
dir.h	…
dlmglue.c	Track negative entries v3	2010-09-10 09:18:15 -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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
extent_map.h	ocfs2: Return extent flags for xattr value tree.	2009-09-22 20:09:39 -07:00
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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
heartbeat.h	…
inode.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
inode.h	Track negative entries v3	2010-09-10 09:18:15 -07:00
ioctl.c	Ocfs2: Add new OCFS2_IOC_INFO ioctl for ocfs2 v8.	2010-09-10 08:35:41 -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: Remove obsolete comments before ocfs2_start_trans.	2010-09-10 08:40:18 -07:00
journal.h	ocfs2: Fix estimate of necessary credits for mkdir	2011-02-20 02:33:32 -08:00
localalloc.c	ocfs2: Limit default local alloc size within bitmap range.	2010-06-15 16:50:43 -07:00
localalloc.h	ocfs2: increase the default size of local alloc windows	2010-05-05 18:18:07 -07:00
locks.c	[PATCH] Skip check for mandatory locks when unlocking	2010-03-17 12:07:16 -07:00
locks.h	…
mmap.c	Merge branch 'cow_readahead' of git://oss.oracle.com/git/tma/linux-2.6 into merge-2	2010-09-10 08:41:04 -07:00
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	ocfs2: Create reflinked file in orphan dir.	2009-09-22 20:09:48 -07:00
ocfs1_fs_compat.h	…
ocfs2.h	ocfs2: Try to free truncate log when meeting ENOSPC in write.	2010-12-16 00:46:02 -08:00
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: 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
quota.h	ocfs2: use system_wq instead of ocfs2_quota_wq	2011-02-01 11:42:42 +01:00
quota_global.c	ocfs2: use system_wq instead of ocfs2_quota_wq	2011-02-01 11:42:42 +01:00
quota_local.c	ocfs2: Zero the tail cluster when extending past i_size.	2010-07-08 13:25:35 -07: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	Merge branch 'cow_readahead' of git://oss.oracle.com/git/tma/linux-2.6 into merge-2	2010-09-10 08:41:04 -07:00
reservations.c	ocfs2: Move 'wanted' into parens of ocfs2_resmap_resv_bits.	2010-09-23 14:16:47 -07:00
reservations.h	ocfs2: make ocfs2_adjust_resv_from_alloc simple.	2010-05-05 18:18:09 -07:00
resize.c	ocfs2: Make ocfs2_journal_dirty() void.	2010-05-05 18:17:29 -07:00
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	ocfs2_dlmfs: Enable the use of user cluster stacks.	2010-02-26 15:41:18 -08:00
stackglue.h	ocfs2_dlmfs: Enable the use of user cluster stacks.	2010-02-26 15:41:18 -08:00
suballoc.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04: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	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	ocfs2: Wrap signal blocking in void functions.	2010-05-10 11:50:10 -07:00
symlink.c	ocfs2: Don't walk off the end of fast symlinks.	2010-09-29 17:33:05 -07:00
symlink.h	…
sysfile.c	ocfs2: Cache system inodes of other slots.	2010-09-10 08:56:24 -07:00
sysfile.h	…
uptodate.c	ocfs2/trivial: Remove trailing whitespaces	2010-01-25 19:20:51 -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	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