diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 13:57:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 13:57:03 -0800 |
| commit | b54eb1795c0cfeb6cc48fdcbd010e800541750ad (patch) | |
| tree | 85ac272cfee48497ecaaf121b74db5a6bd021cf3 /drivers/media/video/cx23885/cx23885-video.c | |
| parent | 0bb324626575e89385ca384d8cdd98fbeaeb0545 (diff) | |
| parent | 69ac74822277fa999a3f469d8362e93262deb3f4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cciss: make device attrs static
Thaw refrigerated bdi flusher threads before invoking kthread_stop on them
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-video.c')
0 files changed, 0 insertions, 0 deletions