summaryrefslogtreecommitdiffstats
path: root/net/mac80211/offchannel.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-13 04:22:57 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-13 04:22:57 +0200
commit26a41cd1eeac299d0d7c505f8d38976a553c8fc4 (patch)
tree374461f6033b5c115274b3e3b1a1c23bf76755f5 /net/mac80211/offchannel.c
parentMerge tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/lin... (diff)
parentblkcg: use trylock on blkcg_pol_mutex in blkcg_reset_stats() (diff)
downloadlinux-26a41cd1eeac299d0d7c505f8d38976a553c8fc4.tar.xz
linux-26a41cd1eeac299d0d7c505f8d38976a553c8fc4.zip
Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fixes from Tejun Heo: "During recent restructuring, device_cgroup unified config input check and enforcement logic; unfortunately, it turned out to share too much. Aristeu's patches fix the breakage and marked for -stable backport. The other two patches are fallouts from kernfs conversion. The blkcg change is temporary and will go away once kernfs internal locking gets simplified (patches pending)" * 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: blkcg: use trylock on blkcg_pol_mutex in blkcg_reset_stats() device_cgroup: check if exception removal is allowed device_cgroup: fix the comment format for recently added functions device_cgroup: rework device access check and exception checking cgroup: fix the retry path of cgroup_mount()
Diffstat (limited to 'net/mac80211/offchannel.c')
0 files changed, 0 insertions, 0 deletions