Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 2 Oct 2007 17:33:49 +0000 (10:33 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 2 Oct 2007 17:33:49 +0000 (10:33 -0700)
commite80eaf9904d5b19512265e1435372b2e12146a5f
tree23a6428c68ac1035c0985a262aa9ed53d1bb4d88
parent3146b39c185f8a436d430132457e84fa1d8f8208
parente48395f1753cab0fde6c03f1db833cece9ef2ba0
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix xics set_affinity code