Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Sun, 30 Apr 2006 19:34:39 +0000 (20:34 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sun, 30 Apr 2006 19:34:39 +0000 (20:34 +0100)
commitb07019f29328ebb1b48d3faf952b84f07ec9b973
tree99fbd8379fb9fe17c5b06c74871f71207ebb072e
parentc3ce7e203af5d8eab7c3390fc991a1fcb152f741
parente0a515bc6a2188f02916e976f419a8640312e32a
Merge git://git./linux/kernel/git/torvalds/linux-2.6

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
include/asm-powerpc/unistd.h