]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 May 2011 00:29:03 +0000 (17:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 May 2011 00:29:03 +0000 (17:29 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
  alpha: Wire up syscalls new to 2.6.39
  alpha: convert to clocksource_register_hz


Trivial merge