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

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (466 commits)
  fanotify: disable fanotify syscalls
  ALSA: hda - Add another HP DV6 quirk
  OSS: soundcard: locking bug in sound_ioctl()
  KVM: x86: Move TSC reset out of vmcb_init
  KVM: x86: Fix SVM VMCB reset
  Input: wacom - fix pressure in Cintiq 21UX2
  kbuild: fix oldnoconfig to do the right thing
  kconfig: Temporarily disable dependency warnings
  Define _addr_lsb in siginfo_t for mips
  virtio-blk: fix request leak.
  intel_idle: enable Atom C6
  net: clear heap allocation for ETHTOOL_GRXCLSRLALL
  isdn: strcpy() => strlcpy()
  exofs: Fix double page_unlock BUG in write_begin/end
  drm/i915: Prevent module unload to avoid random memory corruption
  ARM: SAMSUNG: Add a workaround for get_clock() for serial driver
  ARM: S5P: Bug fix on errors of build with CONFIG_PREEMPT_NONE
  ARM: SAMSUNG: Fix build warnings because of unused codes
  sysctl: fix min/max handling in __do_proc_doulongvec_minmax()
  MAINTAINERS: add Samsung S5P series FIMC maintainers
  ...

Conflicts:
	arch/x86/kvm/svm.c
	virt/kvm/kvm_main.c

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