From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 May 2012 23:34:38 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=03cb00b3c7cc356d0df1d7198d8485b824fef1c8;p=~shefty%2Frdma-dev.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha

Pull alpha fixes from Matt Turner:
 "My alpha tree is back up (after taking quite some time to get my GPG
  key signed).  It contains just some simple fixes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: silence 'const' warning in sys_marvel.c
  alpha: include module.h to fix modpost on Tsunami
  alpha: properly define get/set_rtc_time on Marvel/SMP
  alpha: VGA_HOSE depends on VGA_CONSOLE
---

03cb00b3c7cc356d0df1d7198d8485b824fef1c8