linux/arch/xtensa
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
..
boot xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
configs xtensa: enable m41t80 driver in s6105_defconfig 2009-06-22 02:38:11 -07:00
include/asm Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2009-12-16 12:04:02 -08:00
kernel sanitize do_pipe_flags() callers in arch 2009-12-16 12:16:40 -05:00
lib xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
mm arches: drop superfluous casts in nr_free_pages() callers 2009-09-22 07:17:34 -07:00
platforms tty: const: constify remaining tty_operations 2009-12-11 15:18:03 -08:00
variants xtensa: support s6000 gpio irqs and alternate function selection 2009-06-22 02:37:26 -07:00
Kconfig xtensa: implement ccount calibration for s6000 2009-05-11 22:00:17 -07:00
Kconfig.debug
Makefile xtensa: only build platform or variant if they contain a Makefile 2009-04-03 00:06:45 -07:00