diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 01:53:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 01:53:14 +0200 |
| commit | 9720d75399fd2655a6b6fb06abcf548150f22362 (patch) | |
| tree | a9c239d322420ad96afda07294d0c53295adcd3e /block/scsi_ioctl.c | |
| parent | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | signal: sys_pause() should check signal_pending() (diff) | |
| download | linux-9720d75399fd2655a6b6fb06abcf548150f22362.tar.xz linux-9720d75399fd2655a6b6fb06abcf548150f22362.zip | |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc
* 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc:
signal: sys_pause() should check signal_pending()
ptrace: ptrace_resume() shouldn't wake up !TASK_TRACED thread
Diffstat (limited to 'block/scsi_ioctl.c')
0 files changed, 0 insertions, 0 deletions