tree 8b63f4a8add7f1bfbba02f9ddbbe26e7943afb21
parent c5dd27337a70b34cc400120e70a80fcb84c4fd7a
parent 8746ed3dae14e87e9f7ad8e44649b72e22b33274
author Linus Torvalds <torvalds@woody.osdl.org> 1164163364 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1164163364 -0800

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

* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix ucc_geth of_device discovery on mpc832x
  [POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class"
  [POWERPC] Revert "[POWERPC] Enable generic rtc hook for the MPC8349 mITX"