Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Dec 2009 20:38:55 +0000 (12:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Dec 2009 20:38:55 +0000 (12:38 -0800)
commitdd59f6c76b265ed2ff18b497d6105a9511b1feb1
tree20b2dada6ef16126c8e4c372d65790cc5b757b86
parent70e66a5079b2b33f142303d31581cf03f7af98fe
parentacadbfb90a54673d6c8b05aa4e93218433890411
Merge branch 'for-linus' of git://git./linux/kernel/git/mattst88/alpha-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
  alpha: Convert BUG() to use unreachable()
  alpha: Add minimal support for software performance events
  alpha: Wire up missing/new syscalls