aboutsummaryrefslogtreecommitdiff
path: root/Documentation/filesystems/sysfs.txt
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-09-08 15:39:30 -0700
committerDavid S. Miller <davem@davemloft.net>2008-09-08 15:39:30 -0700
commit98d86c091534f35c4bab294451ae6bccab8e9075 (patch)
tree98c9f0b80bb078405cf173f1d5cc91c72e77082d /Documentation/filesystems/sysfs.txt
parentd875a4b0ffad754e6d89fa561ea7dcdd79c9508b (diff)
parent4d084617fb0d025c42c242362d1f27d337e2d407 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts: arch/sparc/kernel/of_device.c
Diffstat (limited to 'Documentation/filesystems/sysfs.txt')
0 files changed, 0 insertions, 0 deletions