Merge branch 'container'

diff --cc TODO
index 698a6ea58eaa1a54a4bf075bb63d2772d80f941b,0712d848cb09c320b40b3a1b3beec6b3e3857d45..f1d71b139c163ebe4f19bed02f777f52b35d95f7
--- 1/TODO
--- 2/TODO
+++ b/TODO
@@@ -36,4 -42,7 +36,6 @@@ Test: SIGSTO
  Test: ping-pong timing attacks
  Test: big static memory
  Examine the use of taskstats for measuring memory
 -Doc: mount -t cgroup none -o cpuset,cpuacct,memory /sys/fs/cgroup
  Switch license to GPL2/GPL3
+ Options for specifying real-time scheduling
+ Setting of general cgroup attributes, like CPU pinning