aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/lops.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-10 10:49:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-10 10:49:53 -0700
commita4d7749be5de4a7261bcbe3c7d96c748792ec455 (patch)
tree0a38d9a679b063fb17776ba109018a6d66bf97a1 /fs/gfs2/lops.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff)
parentStaging: comedi: David doesn't want to get comedi patches (diff)
downloadlinux-dev-a4d7749be5de4a7261bcbe3c7d96c748792ec455.tar.xz
linux-dev-a4d7749be5de4a7261bcbe3c7d96c748792ec455.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: Staging: comedi: David doesn't want to get comedi patches Staging: rtl8187se: Fix compilation warnings and procfs directory leak Staging: rt2870: new device id Staging: w35und: unregister device from the ieee80211 stack upon ->disconnect()
Diffstat (limited to 'fs/gfs2/lops.c')
0 files changed, 0 insertions, 0 deletions