aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-11-21 18:42:44 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-21 18:42:44 -0800
commit0f9005a6f7a82f4aacbd72f7b92322a8ca1c3f97 (patch)
tree8b63f4a8add7f1bfbba02f9ddbbe26e7943afb21 /block
parentc5dd27337a70b34cc400120e70a80fcb84c4fd7a (diff)
parent8746ed3dae14e87e9f7ad8e44649b72e22b33274 (diff)
downloadmrst-s0i3-test-0f9005a6f7a82f4aacbd72f7b92322a8ca1c3f97.tar.gz
mrst-s0i3-test-0f9005a6f7a82f4aacbd72f7b92322a8ca1c3f97.tar.xz
mrst-s0i3-test-0f9005a6f7a82f4aacbd72f7b92322a8ca1c3f97.zip
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"
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions