Merge branch 'fixes_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbgla...
Linus Torvalds [Wed, 8 Nov 2006 02:22:31 +0000 (18:22 -0800)]
* 'fixes_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbglaw/vax-linux:
  Update for the srm_env driver.


Trivial merge