projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0abb93 0a891ad)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 tip-checkme-2008-05-26_08_52_Mon tip-core-checkme-2008-05-26_08_52_Mon tip-core-percpu-2008-05-26_08_52_Mon tip-core-printk-2008-05-26_08_52_Mon tip-core-rodata-2008-05-26_08_52_Mon tip-core-softirq-2008-05-26_08_52_Mon tip-core-softlockup-2008-05-26_08_52_Mon tip-core-stacktrace-2008-05-26_08_52_Mon tip-core-urgent-2008-05-26_08_52_Mon tip-out-of-tree-2008-05-26_08_52_Mon tip-sched-devel-2008-05-26_08_52_Mon tip-scratch-2008-05-26_08_52_Mon tip-timers-clockevents-2008-05-26_08_52_Mon tip-timers-posixtimers-2008-05-26_08_52_Mon tip-x86-apm-2008-05-26_08_53_Mon tip-x86-bitops-2008-05-26_08_53_Mon tip-x86-checkme-2008-05-26_08_53_Mon tip-x86-i8259-2008-05-26_08_53_Mon tip-x86-resumetrace-2008-05-26_08_54_Mon tip-x86-scratch-2008-05-26_08_54_Mon tip-x86-vdso-2008-05-26_08_54_Mon
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 May 2008 15:08:25 +0000 (08:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 May 2008 15:08:25 +0000 (08:08 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] Fix reversed memset arguments
  Adds username in the upcall key for unattended mounts with keytab
  [CIFS] Remove redundant NULL check


Trivial merge
Linux Kernel tree with some unpolished code for Colibri/Apalis modules