diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 16:40:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 16:40:04 -0800 |
| commit | 1b9bb3c14c60324b54645ffefbe6d270f9fd191c (patch) | |
| tree | e22157379c9b826f9691a0a9af0be7f08cc68d37 /drivers/cdrom/sjcd.h | |
| parent | 0e12c5e85e6fe0a247d547a28a1884915cd3f5b9 (diff) | |
| parent | d355c3c23ce56ab83e41f2bfb30d02fb90618530 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
aoe: Add forgotten NULL at end of attribute list in aoeblk.c
debugfs: check return value correctly
W1: ioremap balanced with iounmap
Diffstat (limited to 'drivers/cdrom/sjcd.h')
0 files changed, 0 insertions, 0 deletions