diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-23 09:50:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-23 09:50:42 -0800 |
| commit | f10cdea68b70bd85706baed0decab59618f9c353 (patch) | |
| tree | 56e5246cc7ac0f606a13e775be632df462afc530 /kernel/power/main.c | |
| parent | Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging (diff) | |
| parent | ktest: Check parent options for iterated tests (diff) | |
| download | linux-dev-f10cdea68b70bd85706baed0decab59618f9c353.tar.xz linux-dev-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/main.c')
0 files changed, 0 insertions, 0 deletions