commit 2e83fc4df5f27dfc1b53044c4f142b2f9d1db08c
author Linus Torvalds <torvalds@linux-foundation.org> Mon May 05 15:48:53 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon May 05 15:48:53 2008 -0700
tree 6afd0fe3aba28ed7137a9b2916a8a6d517ff9c04
parent 17aa7e034416e3080bc57a786d09ba0a4a044561
parent 9185ef6787f1c8f1c06aa0cb3c7746fb4f101f50

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

* 'powerpc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Assign PDE->data before gluing PDE into /proc tree
  [POWERPC] devres: Add devm_ioremap_prot()
  [POWERPC] macintosh: ADB driver: adb_handler_sem semaphore to mutex
  [POWERPC] macintosh: windfarm_smu_sat: semaphore to mutex
  [POWERPC] macintosh: therm_pm72: driver_lock semaphore to mutex