summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-23 18:50:42 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-23 18:50:42 +0100
commitf10cdea68b70bd85706baed0decab59618f9c353 (patch)
tree56e5246cc7ac0f606a13e775be632df462afc530 /kernel/power
parentMerge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentktest: Check parent options for iterated tests (diff)
downloadlinux-f10cdea68b70bd85706baed0decab59618f9c353.tar.xz
linux-f10cdea68b70bd85706baed0decab59618f9c353.zip
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