aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/fs/jbd2/commit.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-26 10:36:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-26 10:36:33 -0700
commitb22dfb735a019a721117e713968c1ddf60ee6142 (patch)
treee3b283a8413befe094fee0841fb96ef3b7ccce1d /fs/jbd2/commit.c
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parentMerge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 (diff)
downloadwireguard-linux-b22dfb735a019a721117e713968c1ddf60ee6142.tar.xz
wireguard-linux-b22dfb735a019a721117e713968c1ddf60ee6142.zip
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] check version in spnego upcall response [CIFS] Kerberos support not considered experimental anymore [CIFS] distinguish between Kerberos and MSKerberos in upcall cifs: add local server pointer to cifs_setup_session [CIFS] reindent misindented statement
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions