Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Feb 2012 00:13:23 +0000 (16:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Feb 2012 00:13:23 +0000 (16:13 -0800)
commit1a4edd9072d3826f1b1234a9b3cc69fcfdebdbfa
treef57a889e4b66b3f5069321ce845655637000a477
parent7e16838d94b566a17b65231073d179bc04d590c8
parent59cca653a601372e9b4a430d867377a3e4a36d76
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  digsig: changed type of the timestamp