aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 14:29:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 14:29:46 -0700
commitf83b1e616f2f68b56b09b2f5116591981fee0c1c (patch)
treed8c423502853b46ec82c58ee31b695552579f7da /fs
parent2f38d70fb4e97e7d00e12eaac45790cf6ebd7b22 (diff)
parent1e626fdcef61460dc75fe7377f38bb019722b848 (diff)
downloadlinux-f83b1e616f2f68b56b09b2f5116591981fee0c1c.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: core: use more outbound tlabels firewire: core: don't update Broadcast_Channel if RFC 2734 conditions aren't met firewire: core: prepare for non-core children of card devices firewire: core: include linux/uaccess.h instead of asm/uaccess.h firewire: add parent-of-unit accessor firewire: rename source files firewire: reorganize header files firewire: clean up includes firewire: ohci: access bus_seconds atomically firewire: also use vendor ID in root directory for driver matches firewire: share device ID table type with ieee1394 firewire: core: add sysfs attribute for easier udev rules firewire: core: check for missing struct update at build time, not run time firewire: core: improve check for local node
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions