Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88...
commit352d4657b23fbd329efccc396000a549e0150907
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Mar 2010 20:49:29 +0000 (19 13:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Mar 2010 20:49:29 +0000 (19 13:49 -0700)
tree6e272c5f902d84b773ed84f8780d963cf18ef245
parent95c46afe6034d15bdf0f95d69f25489cecad9a47
parent5286944d75cbe21dd21b0d57335cc6206622b62a
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: fix compile errors in dma-mapping-common.h
  alpha: remove trailing spaces in messages
  alpha: use __ratelimit