tree 56adf04d6766a4346160aacd709468e5b2f1b879
parent b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2
parent c2cdf6aba0dfcfb54be646ab630c1bccd180e890
author Linus Torvalds <torvalds@linux-foundation.org> 1275605197 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1275605197 -0700

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/macio: Fix probing of macio devices by using the right of match table
  agp/uninorth: Fix oops caused by flushing too much
  powerpc/pasemi: Update MAINTAINERS file
  powerpc/cell: Fix integer constant warning
  powerpc/kprobes: Remove resume_execution() in kprobes
  powerpc/macio: Don't dereference pointer before null check