| commit | 8a335bc631ac9c43675821580c26ebf95a3044ba | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 16 15:06:43 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 16 15:06:43 2011 -0800 |
| tree | e02cf3c2394fe4e07d8e786ff9ba049005b1e928 | |
| parent | 115374211961a503675730603e3d48d95d41736c [diff] | |
| parent | 7b1fff7e4fdf2805fce7afd6247912588d72d604 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6: ocfs2: Make OCFS2_FS depend on CONFIGFS_FS dlm: Make DLM depend on CONFIGFS_FS net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS configfs: change depends -> select SYSFS [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event [SCSI] sd: implement sd_check_events()