tree 20b2dada6ef16126c8e4c372d65790cc5b757b86
parent 70e66a5079b2b33f142303d31581cf03f7af98fe
parent acadbfb90a54673d6c8b05aa4e93218433890411
author Linus Torvalds <torvalds@linux-foundation.org> 1261255135 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1261255135 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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