| commit | 66643de455c27973ac31ad6de9f859d399916842 | |
| author | David Woodhouse <dwmw2@infradead.org> | |
| Wed, 24 May 2006 08:22:21 +0000 (24 09:22 +0100) | ||
| committer | David Woodhouse <dwmw2@infradead.org> | |
| Wed, 24 May 2006 08:22:21 +0000 (24 09:22 +0100) | ||
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f | treesnapshot (tar.gz zip) |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 | commitdiff |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc | commitdiff |
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
18 files changed: