]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  maintainers: update my email address


Trivial merge