summaryrefslogtreecommitdiff
path: root/fs/locks.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-13 13:16:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-13 13:16:22 -0700
commitebe168d52c6255cfaf701b488e9e9ed0f548da19 (patch)
tree7f81320e09983d749bc38047857563f7fd269480 /fs/locks.c
parentb15a3891c916f32a29832886a053a48be2741d4d (diff)
parentcc74d96f47b0d916840f92092595e3be9731e047 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: PCI: fix issue with busses registering multiple times in sysfs
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions