tree ad81aba3744848d97df016f21e63390ab6fe0752
parent d9f73afcd364eb02b355921f6101db9e7ee4001c
parent fa32154e47a203688453e53c1369fcbc63b06a21
author Linus Torvalds <torvalds@linux-foundation.org> 1286217935 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1286217935 -0700

Merge branch 'merge-powerpc' of git://git.secretlab.ca/git/linux-2.6

* 'merge-powerpc' of git://git.secretlab.ca/git/linux-2.6:
  powerpc/5200: tighten up ac97 reset timing
  powerpc/5200: efika.c: Add of_node_put to avoid memory leak
  powerpc/512x: fix clk_get() return value