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)
commita132ebcb454568cc06fbdf3a5629eb9d64c9d578
tree38e05a5a9b42f9e5a69dca6ad2de04ba126e95e8
parent807708844979ba8c6d5717345a8608454992696d
parent0115cb544b0a6709e9cf3de615e150d22e7d9d10
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* '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()