aboutsummaryrefslogtreecommitdiff
path: root/block/blktrace.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-09 08:10:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-09 08:10:09 -0700
commit26c5e98e88a6126adef2ddce21899e5afe823a2b (patch)
treeb5300f706c700667384d811a74750d2fe287e0ae /block/blktrace.c
parenta9545ee3c8153e133556aaaa8110337ca3f864dc (diff)
parentaf4b3c355cbd38703471e55d11f42d8640db4118 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] fix build warning [CIFS] Fixed build warning in is_ip [CIFS] cleanup cifsd completion [CIFS] Remove over-indented code in find_unc(). [CIFS] fix typo [CIFS] Remove duplicate call to mode_to_acl [CIFS] convert usage of implicit booleans to bool [CIFS] fixed compatibility issue with samba refferal request [CIFS] Fix statfs formatting [CIFS] Adds to dns_resolver checking if the server name is an IP addr and skipping upcall in this case. [CIFS] Fix spelling mistake [CIFS] Update cifs version number
Diffstat (limited to 'block/blktrace.c')
0 files changed, 0 insertions, 0 deletions