]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit0f9005a6f7a82f4aacbd72f7b92322a8ca1c3f97
tree8b63f4a8add7f1bfbba02f9ddbbe26e7943afb21tree | snapshot
parentc5dd27337a70b34cc400120e70a80fcb84c4fd7acommit | diff
parent8746ed3dae14e87e9f7ad8e44649b72e22b33274commit | diff
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"
Linux 2.6 source tree