diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-21 18:42:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-21 18:42:44 -0800 |
| commit | 0f9005a6f7a82f4aacbd72f7b92322a8ca1c3f97 (patch) | |
| tree | 8b63f4a8add7f1bfbba02f9ddbbe26e7943afb21 /fs/ocfs2/dir.c | |
| parent | c5dd27337a70b34cc400120e70a80fcb84c4fd7a (diff) | |
| parent | 8746ed3dae14e87e9f7ad8e44649b72e22b33274 (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"
Diffstat (limited to 'fs/ocfs2/dir.c')
0 files changed, 0 insertions, 0 deletions