Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jul 2009 17:05:34 +0000 (10:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jul 2009 17:05:34 +0000 (10:05 -0700)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix another bug in move of altivec code to vector.S
  powerpc: Fix booke user_disable_single_step()


Trivial merge