tree a643fa46d6e3b9331154b8e08ff3308bac9af388
parent e760e430691abcc9f0c5d076500fb9859f17c15b
parent dd775ae2549217d3ae09363e3edb305d0fa19928
author Avi Kivity <avi@redhat.com> 1333457486 +0300
committer Avi Kivity <avi@redhat.com> 1333457486 +0300

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into HEAD

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: (9636 commits)
  Linux 3.4-rc1
  vfs: fix out-of-date dentry_unhash() comment
  vfs: split __lookup_hash
  untangling do_lookup() - take __lookup_hash()-calling case out of line.
  untangling do_lookup() - switch to calling __lookup_hash()
  untangling do_lookup() - merge d_alloc_and_lookup() callers
  untangling do_lookup() - merge failure exits in !dentry case
  untangling do_lookup() - massage !dentry case towards __lookup_hash()
  untangling do_lookup() - get rid of need_reval in !dentry case
  untangling do_lookup() - eliminate a loop.
  untangling do_lookup() - expand the area under ->i_mutex
  untangling do_lookup() - isolate !dentry stuff from the rest of it.
  vfs: move MAY_EXEC check from __lookup_hash()
  vfs: don't revalidate just looked up dentry
  vfs: fix d_need_lookup/d_revalidate order in do_lookup
  ext3: move headers to fs/ext3/
  migrate ext2_fs.h guts to fs/ext2/ext2.h
  new helper: ext2_image_size()
  get rid of pointless includes of ext2_fs.h
  ext2: No longer export ext2_fs.h to user space
  ...

Conflicts:
	Documentation/feature-removal-schedule.txt
	Documentation/virtual/kvm/api.txt
	arch/powerpc/include/asm/cputable.h
	arch/powerpc/include/asm/kvm_e500.h
	arch/powerpc/include/asm/kvm_host.h
	arch/powerpc/include/asm/kvm_ppc.h
	arch/powerpc/include/asm/system.h
	arch/powerpc/kernel/asm-offsets.c
	arch/powerpc/kernel/idle_power7.S
	arch/powerpc/kvm/book3s.c
	arch/powerpc/kvm/book3s_64_mmu_hv.c
	arch/powerpc/kvm/book3s_hv.c
	arch/powerpc/kvm/book3s_hv_builtin.c
	arch/powerpc/kvm/book3s_pr.c
	arch/powerpc/kvm/booke.c
	arch/powerpc/kvm/e500.c
	arch/powerpc/kvm/e500_emulate.c
	arch/powerpc/kvm/e500_tlb.c
	arch/powerpc/kvm/e500_tlb.h
	arch/powerpc/kvm/powerpc.c
	arch/x86/include/asm/cpufeature.h
	arch/x86/kvm/mmu.c
	arch/x86/kvm/x86.c
	include/linux/kvm.h
	include/linux/kvm_host.h
	virt/kvm/kvm_main.c

Signed-off-by: Avi Kivity <avi@redhat.com>