summaryrefslogtreecommitdiff
path: root/fs/locks.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-05 20:57:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-05 20:57:45 -0700
commita2fa83faf47b514ab947cea916d3691b66525073 (patch)
treed08743acf3957b0f103c832a31d4bc0a26ef57e7 /fs/locks.c
parent2d12a18b89f5e3c0cce1981cc257228bfbf9039f (diff)
parente534c5b831c8b8e9f5edee5c8a37753c808b80dc (diff)
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: fix regression occurring during device removal USB: fsl_udc_core: fix build breakage when building for ARM arch
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions