Merge branch 'fixes_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbgla...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Nov 2006 02:22:31 +0000 (18:22 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Nov 2006 02:22:31 +0000 (18:22 -0800)
commit5b064423d66159a1b33ff9d5bcb42040a03e7dfe
tree2eb42eb50d75ca6e4ec773e81db6136adb5c0d7a
parent3d4248885b9fca818e7fe6b66328e714876d36ad
parent16b7f4dcd340875625714438a812ea06400f9666
Merge branch 'fixes_for_linus' of git://git./linux/kernel/git/jbglaw/vax-linux

* 'fixes_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbglaw/vax-linux:
  Update for the srm_env driver.