kernel_optimize_test/arch/xtensa/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
..
asmmacro.h
atomic.h asm-generic: rename atomic.h to atomic-long.h 2009-06-11 21:02:17 +02:00
auxvec.h
bitops.h
bitsperlong.h asm-generic: introduce asm/bitsperlong.h 2009-06-11 21:02:14 +02:00
bootparam.h
bug.h
bugs.h
byteorder.h byteorder: make swab.h include asm/swab.h like a regular header 2009-01-14 19:56:50 -08:00
cache.h
cacheasm.h
cacheflush.h block: add helpers to run flush_dcache_page() against a bio and a request's pages 2009-11-26 09:16:19 +01:00
checksum.h xtensa: Fix checksum header file 2009-05-11 21:48:23 -07:00
coprocessor.h
cpumask.h
cputime.h
current.h
delay.h
device.h
div64.h
dma-mapping.h
dma.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
elf.h elf: kill USE_ELF_CORE_DUMP 2009-12-16 07:20:12 -08:00
emergency-restart.h
errno.h
fb.h
fcntl.h
flat.h xtensa: add flat support 2009-04-02 23:41:29 -07:00
ftrace.h tracing: make CALLER_ADDRx overwriteable 2009-03-02 16:49:37 -05:00
futex.h
gpio.h xtensa: support s6000 gpio irqs and alternate function selection 2009-06-22 02:37:26 -07:00
hardirq.h
highmem.h
hw_irq.h
io.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
ioctl.h
ioctls.h
ipcbuf.h
irq_regs.h
irq.h xtensa: allow variant to initialize own irq chips 2009-06-22 02:36:59 -07:00
Kbuild byteorder: make swab.h include asm/swab.h like a regular header 2009-01-14 19:56:50 -08:00
kdebug.h
kmap_types.h kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
linkage.h
local.h
mman.h mm: add MAP_HUGETLB for mmaping pseudo-anonymous huge page regions 2009-09-22 07:17:41 -07:00
mmu_context.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
mmu.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
module.h
msgbuf.h
mutex.h
nommu_context.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
nommu.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
page.h asm-generic: rename page.h and uaccess.h 2009-06-11 21:02:17 +02:00
param.h
pci-bridge.h
pci.h
percpu.h
pgalloc.h
pgtable.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
platform.h xtensa: remove platform rtc hooks 2009-04-02 23:45:07 -07:00
poll.h
posix_types.h
processor.h xtensa: nommu support 2009-04-02 23:41:50 -07:00
ptrace.h
regs.h
resource.h
rmap.h
rwsem.h
scatterlist.h
sections.h
segment.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h
socket.h net: Generalize socket rx gap / receive queue overflow cmsg 2009-10-12 13:26:31 -07:00
sockios.h
spinlock.h
stat.h
statfs.h
string.h
swab.h headers_check fix: xtensa, swab.h 2009-02-01 11:01:30 +05:30
syscall.h sanitize do_pipe_flags() callers in arch 2009-12-16 12:16:40 -05:00
system.h
termbits.h
termios.h
thread_info.h sched: INIT_PREEMPT_COUNT 2009-07-10 14:24:05 -07:00
timex.h xtensa: fix wrong extern declaration renamed in code using it 2009-05-11 22:00:11 -07:00
tlb.h mm: Pass virtual address to [__]p{te,ud,md}_free_tlb() 2009-07-27 12:10:38 -07:00
tlbflush.h
topology.h
types.h
uaccess.h
ucontext.h
unaligned.h
unistd.h sanitize do_pipe_flags() callers in arch 2009-12-16 12:16:40 -05:00
user.h
vga.h
xor.h