From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Wed, 22 Nov 2006 02:42:44 +0000 (-0800)
Subject: Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: Ubuntu-5.0.0-8.9~44820^2~20^2~55
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0f9005a6f7a82f4aacbd72f7b92322a8ca1c3f97;p=mirror_ubuntu-disco-kernel.git

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"
---

0f9005a6f7a82f4aacbd72f7b92322a8ca1c3f97