Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 23 Mar 2007 02:42:42 +0000 (19:42 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 23 Mar 2007 02:42:42 +0000 (19:42 -0700)
commit7f52a3afc4c02db75b3953fcbbb980abc86873a2
tree7c771c73ee3cfa0bd3d8a9433462919da377ffa2
parent4edc5db83f574dfcc8be35b7b96760ded543b360
parent4f5fa2fb1259f506d20e8af447117ec3ec426a53
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] Bypass hcall stats until cpu features have run
  [POWERPC] Avoid hypervisor statistics calculation in real mode
  [POWERPC] Fix atomicity of TIF update in flush_thread()