]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'upstream' into next
authorAvi Kivity <avi@redhat.com>
Sun, 5 Aug 2012 10:25:10 +0000 (13:25 +0300)
committerAvi Kivity <avi@redhat.com>
Sun, 5 Aug 2012 10:25:10 +0000 (13:25 +0300)
commitfe56097b23b1303b894eefd91582e4a64247d03f
tree4b3ab60eb19e8cfe2884e2da66dd4e4e25ae2274
parente115676e042f4d9268c6b6d8cb7dc962aa6cfd7d
parente7882d6c40874a5b5033ca85f7508a602a60b662
Merge remote-tracking branch 'upstream' into next

 - bring back critical fixes (esp. aa67f6096c19bc)
 - provide an updated base for development

* upstream: (4334 commits)
  missed mnt_drop_write() in do_dentry_open()
  UBIFS: nuke pdflush from comments
  gfs2: nuke pdflush from comments
  drbd: nuke pdflush from comments
  nilfs2: nuke write_super from comments
  hfs: nuke write_super from comments
  vfs: nuke pdflush from comments
  jbd/jbd2: nuke write_super from comments
  btrfs: nuke pdflush from comments
  btrfs: nuke write_super from comments
  ext4: nuke pdflush from comments
  ext4: nuke write_super from comments
  ext3: nuke write_super from comments
  Documentation: fix the VM knobs descritpion WRT pdflush
  Documentation: get rid of write_super
  vfs: kill write_super and sync_supers
  ACPI processor: Fix tick_broadcast_mask online/offline regression
  ACPI: Only count valid srat memory structures
  ACPI: Untangle a return statement for better readability
  Linux 3.6-rc1
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>
arch/s390/include/asm/processor.h
arch/s390/kernel/dis.c
arch/x86/kvm/vmx.c
arch/x86/kvm/x86.c