From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 1 May 2012 12:29:55 +0000 (+0200)
Subject: Merge tag 'v3.4-rc5' into for-3.5/core
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0b7877d4eea3f93e3dd941999522bbd8c538cb53;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'v3.4-rc5' into for-3.5/core

The core branch is behind driver commits that we want to build
on for 3.5, hence I'm pulling in a later -rc.

Linux 3.4-rc5

Conflicts:
	Documentation/feature-removal-schedule.txt

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

0b7877d4eea3f93e3dd941999522bbd8c538cb53
diff --cc Documentation/feature-removal-schedule.txt
index 5298e126cea3,03ca210406ed..1fafa401a1c5
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -542,9 -534,8 +534,17 @@@ Who:	Kees Cook <keescook@chromium.org
  
  ----------------------------
  
 +What:	cgroup option updates via remount
 +When:	March 2013
 +Why:	Remount currently allows changing bound subsystems and
 +	release_agent.  Rebinding is hardly useful as it only works
 +	when the hierarchy is empty and release_agent itself should be
 +	replaced with conventional fsnotify.
++
++----------------------------
++
+ What:	setitimer accepts user NULL pointer (value)
+ When:	3.6
+ Why:	setitimer is not returning -EFAULT if user pointer is NULL. This
+ 	violates the spec.
+ Who:	Sasikantha Babu <sasikanth.v19@gmail.com>