git.alex.org.uk - linux-flexiantxendom0-3.2.10.git/commit

author	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 5 May 2012 23:34:38 +0000 (16:34 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 5 May 2012 23:34:38 +0000 (16:34 -0700)
commit	03cb00b3c7cc356d0df1d7198d8485b824fef1c8
tree	07561c3c8bf2a7b8484effbfc53dad3816f054f6	tree \| snapshot
parent	49a5f3cf6a956360bb43e5f8d0c592a8daea8ebd	commit \| diff
parent	2f2be2784a60d7ab3f13dbb3e18f0cadea5bb655	commit \| diff

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