diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 00:06:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 00:06:43 +0100 |
| commit | 8a335bc631ac9c43675821580c26ebf95a3044ba (patch) | |
| tree | e02cf3c2394fe4e07d8e786ff9ba049005b1e928 /drivers/net/cxgb4 | |
| parent | parisc: fix compile breakage caused by inlining maybe_mkwrite (diff) | |
| parent | ocfs2: Make OCFS2_FS depend on CONFIGFS_FS (diff) | |
| download | linux-8a335bc631ac9c43675821580c26ebf95a3044ba.tar.xz linux-8a335bc631ac9c43675821580c26ebf95a3044ba.zip | |
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()
Diffstat (limited to 'drivers/net/cxgb4')
0 files changed, 0 insertions, 0 deletions