summaryrefslogtreecommitdiff
path: root/drivers/nfc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-17 02:06:43 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-17 02:06:43 +0300
commit8a335bc631ac9c43675821580c26ebf95a3044ba (patch)
treee02cf3c2394fe4e07d8e786ff9ba049005b1e928 /drivers/nfc
parent115374211961a503675730603e3d48d95d41736c (diff)
parent7b1fff7e4fdf2805fce7afd6247912588d72d604 (diff)
downloadlinux-8a335bc631ac9c43675821580c26ebf95a3044ba.tar.xz
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/nfc')
0 files changed, 0 insertions, 0 deletions