| commit | ab396e91bfe953db26fa1083d9c3e7a4fbe0334a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue Jan 10 08:21:33 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue Jan 10 08:21:33 2006 -0800 |
| tree | 81db9e5f919b84dcb4284ca8cdf675e13716c191 | |
| parent | 9979ead5d1eb23191a00453559927c5abf9087e2 [diff] | |
| parent | 4f0210b9c4889eede9f8f379f93570c01998ccb9 [diff] |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Fix up some trivial conflicts in {i386|ia64}/Makefile