summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-12 15:18:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-12 15:18:20 -0700
commit0b1fd266bffdab61f5936c9b67d892b353cbf54e (patch)
tree42098cb8e8cf57153af7052dfedbe04ca2e6be40 /drivers/watchdog
parent6074fffbf8cd4d966b29c17a25f0b336074ebc28 (diff)
parentc369c9a4a7c82d33329d869cbaf93304cc7a0c40 (diff)
downloadlinux-0b1fd266bffdab61f5936c9b67d892b353cbf54e.tar.bz2
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fix from Steve French: "Fixes a regression in cifs in which a password which begins with a comma is parsed incorrectly as a blank password" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: cifs: Allow passwords which begin with a delimitor
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions