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: (3179 commits)
  vfs: reorganize 'struct inode' layout a bit
  selinux: simplify and clean up inode_has_perm()
  MAINTAINERS: add a maintainer to Gadget Framework
  USB: serial: add another 4N-GALAXY.DE PID to ftdi_sio driver
  spi/rtc-m41t93: Use spi_get_drvdata() for SPI devices
  cifs: trivial: add space in fsc error message
  tty_buffer: get rid of 'seen_tail' logic in flush_to_ldisc
  drm/radeon/kms: disable hdmi audio by default
  drm/radeon/kms: fix for radeon on systems >4GB without hardware iommu
  drm/radeon/kms: set family for use in parser.
  MAINTAINERS: Saying goodbye to David Brownell
  MN10300: Add missing _sdata declaration
  MN10300: die_if_no_fixup() shouldn't use get_user() as it doesn't call set_fs()
  MN10300: Fix one of the kernel debugger cacheflush variants
  Revert "USB: option: add ID for ZTE MF 330"
  PM / Runtime: Fix loops in pm_runtime_clk_notify()
  gpio/samsung: make Kconfig options def_bool
  PM / Intel IOMMU: Fix init_iommu_pm_ops() for CONFIG_PM unset
  gpio/exynos4: Fix incorrect mapping of gpio pull-up macro to register setting
  drivers/usb/host/ohci-pxa27x.c: add missing clk_put
  ...

Conflicts:
	arch/x86/kvm/emulate.c

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

diff --cc arch/x86/kvm/mmu.c
Simple merge