summaryrefslogtreecommitdiff
path: root/kernel/power
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-23 09:50:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-23 09:50:42 -0800
commitf10cdea68b70bd85706baed0decab59618f9c353 (patch)
tree56e5246cc7ac0f606a13e775be632df462afc530 /kernel/power
parent5907c5f8adbd0bb7ab69124520304e5b25c8eb5e (diff)
parentf9dfb65b055c56678afa03e13e942761459ea53d (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest: ktest: Check parent options for iterated tests
Diffstat (limited to 'kernel/power')
0 files changed, 0 insertions, 0 deletions