Files
linux/arch/x86/include/asm
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
..
…
…
…
…
…
…
2009-12-05 09:10:12 -08:00
…
…
…
…
…
…
…
…
…
2009-04-07 13:36:36 +02:00
…
2009-12-16 07:20:12 -08:00
…
…
…
…
…
…
…
…
…
2009-11-03 09:11:15 -05:00
…
2009-03-27 14:43:57 -04:00
…
2009-08-27 00:35:56 +02:00
…
…
2009-04-10 20:27:13 +02:00
…
…
…
2009-11-08 12:55:38 +01:00
…
…
2009-06-13 15:37:30 +02:00
…
2009-09-10 10:46:49 +03:00
2009-12-03 09:32:25 +02:00
…
2009-07-30 16:03:46 +09:30
…
…
…
…
…
…
…
2009-05-18 09:21:04 +02:00
…
…
…
…
2009-10-12 22:56:45 +02:00
…
2009-10-29 22:34:12 +09:00
…
…
…
…
…
…
…
…
…
…
…
…
2009-08-31 11:09:40 +02:00
…
…
…
…
2009-06-15 12:40:02 +02:00
…
2009-04-01 08:59:16 -07:00
…
…
2009-09-22 19:57:51 -07:00
…
…
2009-07-19 18:27:52 +02:00
…
…
…
…
…
…
…
2009-08-21 21:43:46 +02:00
…
…
…
…
…
2009-06-15 12:40:02 +02:00