Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Feb 2012 02:25:30 +0000 (18:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Feb 2012 02:25:30 +0000 (18:25 -0800)
commit719741d9986572d64b47c35c09f5e7bb8d389400
treec8cb9001989debd328711a4cd19f7a7cb7877dfe
parent6b0d1abb354d2d6b991c051e7380bd484a05e61f
parent9b45c0d2c50e19bd73d2f5e18dd6912a6991306e
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:
  maintainers: update my email address