summaryrefslogtreecommitdiffstats
path: root/drivers/w1/w1.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-22 03:10:19 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-22 03:10:19 +0200
commit52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f (patch)
treef6fa8468885835152f131e3abc094da369d15669 /drivers/w1/w1.c
parent[PATCH] USB: only make /sys/class/usb show up when there is something in it (diff)
parentMerge HEAD from ../linux-2.6 (diff)
downloadlinux-52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f.tar.xz
linux-52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f.zip
Merge git://oss.sgi.com:8090/xfs-2.6
* git://oss.sgi.com:8090/xfs-2.6: (43 commits) [XFS] Remove files from the build that are now unused. [XFS] Fix a Makefile issue related to exports.o handling. [XFS] Remove version 1 directory code. Never functioned on Linux, just [XFS] Map EFSCORRUPTED to an actual error code, not just a made up one [XFS] Kill direct access to ->count in valusema(); all we ever use it for [XFS] Remove unneeded conditional code on NFS export interface related [XFS] Remove an incorrect use of unlikely() on a relatively likely code [XFS] Push some common code out of write path into core XFS code for [XFS] Remove unnecessary local from open_exec dmapi path. [XFS] Minor XFS documentation updates. [XFS] Fix broken const use inside local suffix_strtoul routine. [XFS] Fix nused counter. It's currently getting set to -1 rather than [XFS] Fix mismerge of the fs_writable cleanup patch causing a freeze/thaw [XFS] Fix up debug code so that bulkstat wont generate thousands of [XFS] Remove unused parameter from di2xflags routine. [XFS] Cleanup a missed porting conversion, and freezing. [XFS] Resolve a namespace collision on remaining vtypes for FreeBSD [XFS] Resolve a namespace collision on vnode/vnodeops for FreeBSD porters. [XFS] Resolve a namespace collision on vfs/vfsops for FreeBSD porters. [XFS] statvfs component of directory/project quota support, code ...
Diffstat (limited to 'drivers/w1/w1.c')
0 files changed, 0 insertions, 0 deletions