commit | 865752ed0a2ca1288ab8e638265066d6f5264da9 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 28 15:52:54 2013 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 28 15:52:54 2013 -0700 |
tree | 42be69deceb301ec1c35157dcdbbd8c12fe533bc | |
parent | 97f084b8e64fb69ad1ede987c98c443f440a8aa1 [diff] | |
parent | e4317ce877a31dbb9d96375391c1c4ad2210d637 [diff] |
Merge tag 'staging-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging driver fixes from Greg Kroah-Hartman: "Here are two tiny staging driver fixes to resolve issues that have been reported." * tag 'staging-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: comedi: s626: fix continuous acquisition staging: zcache: fix typo "64_BIT"