]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
projects / mirror_ubuntu-disco-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5dd273 8746ed3)
Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 22 Nov 2006 02:42:44 +0000 (18:42 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 22 Nov 2006 02:42:44 +0000 (18:42 -0800)
* '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"


Trivial merge
Ubuntu Disco kernel mirror for Proxmox VE and PMG