original_kernel/arch/ia64/kernel
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
..
cpufreq
.gitignore
Makefile
Makefile.gate
acpi-ext.c
acpi-processor.c
acpi.c
asm-offsets.c
audit.c
brl_emu.c
crash.c
crash_dump.c
cyclone.c
dma-mapping.c
efi.c
efi_stub.S
entry.S
entry.h
err_inject.c
esi.c
esi_stub.S
fsys.S
fsyscall_gtod_data.h
ftrace.c
gate-data.S
gate.S
gate.lds.S
head.S
ia64_ksyms.c
init_task.c
iosapic.c
irq.c
irq_ia64.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 2009-12-16 10:44:43 -08:00
irq_lsapic.c
ivt.S
jprobes.S
kprobes.c
machine_kexec.c
machvec.c
mca.c [IA64] Save I-resources to ia64_sal_os_state 2009-12-14 16:37:58 -08:00
mca_asm.S
mca_drv.c
mca_drv.h
mca_drv_asm.S
minstate.h
module.c
msi_ia64.c
nr-irqs.c
numa.c
pal.S
palinfo.c
paravirt.c
paravirt_inst.h
paravirt_patch.c
paravirt_patchlist.c
paravirt_patchlist.h
paravirtentry.S
patch.c
pci-dma.c
pci-swiotlb.c
perfmon.c switch alloc_file() to passing struct path 2009-12-16 12:16:42 -05:00
perfmon_default_smpl.c
perfmon_generic.h
perfmon_itanium.h
perfmon_mckinley.h
perfmon_montecito.h
process.c
ptrace.c
relocate_kernel.S
sal.c
salinfo.c
setup.c
sigframe.h
signal.c
smp.c
smpboot.c
sys_ia64.c
time.c
topology.c
traps.c
unaligned.c
uncached.c
unwind.c
unwind_decoder.c
unwind_i.h
vmlinux.lds.S