path: root/Makefile
diff options
authorLinus Torvalds <>2013-05-20 14:25:19 -0700
committerLinus Torvalds <>2013-05-20 14:25:19 -0700
commit669c743362daa6b9167cef4df8b405ba9c5c3a53 (patch)
treedb2abdeed1d5a7b80ddfc557e9210bc0a9157330 /Makefile
parent622f223488517f2b0a5a5e518b2a6c950cf0a2ee (diff)
parentfce92683570c2ddcdb82cde67b0b07800106fbd9 (diff)
Merge tag 'stable/for-linus-3.10-rc1-tag' of git://
Pull Xen fixes from Konrad Rzeszutek Wilk: - Regression fix in xen privcmd fixing a memory leak. - Add Documentation for tmem driver. - Simplify and remove code in the tmem driver. - Cleanups. * tag 'stable/for-linus-3.10-rc1-tag' of git:// xen: Fixed assignment error in if statement xen/xenbus: Fixed over 80 character limit issue xen/xenbus: Fixed indentation error in switch case xen/tmem: Don't use self[ballooning|shrinking] if frontswap is off. xen/tmem: Remove the usage of '[no|]selfballoon' and use 'tmem.selfballooning' bool instead. xen/tmem: Remove the usage of 'noselfshrink' and use 'tmem.selfshrink' bool instead. xen/tmem: Remove the boot options and fold them in the tmem.X parameters. xen/tmem: s/disable_// and change the logic. xen/tmem: Fix compile warning. xen/tmem: Split out the different module/boot options. xen/tmem: Move all of the boot and module parameters to the top of the file. xen/tmem: Cleanup. Remove the parts that say temporary. xen/privcmd: fix condition in privcmd_close()
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions