tree 6e272c5f902d84b773ed84f8780d963cf18ef245
parent 95c46afe6034d15bdf0f95d69f25489cecad9a47
parent 5286944d75cbe21dd21b0d57335cc6206622b62a
author Linus Torvalds <torvalds@linux-foundation.org> 1269031769 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1269031769 -0700

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: fix compile errors in dma-mapping-common.h
  alpha: remove trailing spaces in messages
  alpha: use __ratelimit