| commit | 66643de455c27973ac31ad6de9f859d399916842 | [log] [tgz] |
|---|---|---|
| author | David Woodhouse <dwmw2@infradead.org> | Wed May 24 09:22:21 2006 +0100 |
| committer | David Woodhouse <dwmw2@infradead.org> | Wed May 24 09:22:21 2006 +0100 |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 [diff] | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/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>