diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 15:40:45 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 15:40:45 +1100 |
| commit | 93ae1a8e0e4ebaf960de8affa746fdac955c49b9 (patch) | |
| tree | bef784ee12a60cb34bab91f9eb81f5d797bb2904 /Documentation | |
| parent | 33f839f5fb99702be82b59c122eafae353d53747 (diff) | |
| parent | 0cae60f91494e34a0c5391f1455f825d5849b05f (diff) | |
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
drivers/mmc/host/mvsdio.c
drivers/pci/pci-driver.c
drivers/pci/pci-sysfs.c
include/linux/netdevice.h
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/filesystems.tmpl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/DocBook/filesystems.tmpl b/Documentation/DocBook/filesystems.tmpl index 25b58efd955d..4f676838da06 100644 --- a/Documentation/DocBook/filesystems.tmpl +++ b/Documentation/DocBook/filesystems.tmpl @@ -91,7 +91,6 @@ <title>The Filesystem for Exporting Kernel Objects</title> !Efs/sysfs/file.c !Efs/sysfs/symlink.c -!Efs/sysfs/bin.c </chapter> <chapter id="debugfs"> |