From: Avi Kivity <[email protected]>
* 'master' of
ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (3215
commits)
perf_events: Fix perf_counter_mmap() hook in mprotect()
cifs: fix a memleak in cifs_setattr_nounix()
kernel: Constify temporary variable in roundup()
sparc: fix openpromfs compile
cifs: make cifs_ioctl handle NULL filp->private_data correctly
ext4: Add new ext4 inode tracepoints
ext4: Don't call sb_issue_discard() in ext4_free_blocks()
ext4: do not try to grab the s_umount semaphore in ext4_quota_off
ext4: fix potential race when freeing ext4_io_page structures
ext4: handle writeback of inodes which are being freed
sh: clkfwk: Fix up checkpatch warnings.
sh: make some needlessly global sh7724 clocks static
sh: add clk_round_parent() to optimize parent clock rate
Staging: ath6kl: remove empty files that mess with 'distclean'
floppy: fix another use-after-free
TTY: move .gitignore from drivers/char/ to drivers/tty/vt/
ipw2x00: remove the right /proc/net entry
floppy: fix use-after-free in module load failure path
watchdog: Fix section mismatch and potential undefined behavior.
posix-cpu-timers: workaround to suppress the problems with mt exec
...
Conflicts:
arch/x86/kvm/x86.c
Signed-off-by: Avi Kivity <[email protected]>
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
