git.karo-electronics.de Git - karo-tx-linux.git/commit

Merge branch 'stable/for-linus-3.8' into linux-next

* stable/for-linus-3.8:
  xen/gntdev: remove erronous use of copy_to_user
  xen/gntdev: correctly unmap unlinked maps in mmu notifier
  xen/gntdev: fix unsafe vma access
  xen/privcmd: Fix mmap batch ioctl.
  Xen: properly bound buffer access when parsing cpu/*/availability
  xen/grant-table: correctly initialize grant table version 1
  x86/xen : Fix the wrong check in pciback
  xen/privcmd: Relax access control in privcmd_ioctl_mmap

Conflicts:
arch/arm/xen/enlighten.c

author	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
	Tue, 15 Jan 2013 21:05:05 +0000 (16:05 -0500)
committer	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
	Tue, 15 Jan 2013 21:05:05 +0000 (16:05 -0500)
commit	5003d602aafbbfa3399690bd911d0b5736314898
tree	af94cd4e736392034f11f97908674a7514a20f8a	tree \| snapshot
parent	df0262b9bc86a78d8db0d9a20930bcce8d2d4eed	commit \| diff
parent	1affa98d23c0188fdd4433512489be753a25bb23	commit \| diff

arch/arm/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/cpu_hotplug.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/gntdev.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/grant-table.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/privcmd.c	diff1 \|	diff2 \|	blob \| history