]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd9fef9f8865f67563188c28f4bf99e47b1dd980d
tree8b63f4a8add7f1bfbba02f9ddbbe26e7943afb21
parent743758dcfb0a1a9d9d74b2945895d9cab17717c4
parent081e0a6f8d1ceab8795a95d40480e6b9c30ddc8f
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"