tree dd8b793c534b6f83cc16f38ba96d0ff4722a7344
parent 30574b61611ccd29677989097f8c8a5d9a73d873
parent 4393c4f6788cee65095dd838cfeca6edefbfeb52
author Linus Torvalds <torvalds@g5.osdl.org> 1162391900 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1162391900 -0800

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Make alignment exception always check exception table
  [POWERPC] Disallow kprobes on emulate_step and branch_taken
  [POWERPC] Make mmiowb's io_sync preempt safe
  [POWERPC] Make high hugepage areas preempt safe
  [POWERPC] Make current preempt-safe
  [POWERPC] qe_lib: qe_issue_cmd writes wrong value to CECDR
  [POWERPC] Use 4kB iommu pages even on 64kB-page systems
  [POWERPC] Fix oprofile support for e500 in arch/powerpc
  [POWERPC] Fix rmb() for e500-based machines it
  [POWERPC] Fix various offb issues