err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bd787d4 ed28f96)

author	Paul Mackerras <paulus@samba.org>
	Mon, 31 Oct 2005 02:37:12 +0000 (13:37 +1100)
committer	Paul Mackerras <paulus@samba.org>
	Mon, 31 Oct 2005 02:37:12 +0000 (13:37 +1100)
commit	23fd07750a789a66fe88cf173d52a18f1a387da4
tree	06fdd6df35fdb835abdaa9b754d62f6b84b97250	tree \| snapshot
parent	bd787d438a59266af3c9f6351644c85ef1dd21fe	commit \| diff
parent	ed28f96ac1960f30f818374d65be71d2fdf811b0	commit \| diff

Merge ../linux-2.6 by hand

15 files changed:

arch/powerpc/mm/mem.c	diff1 \|	\|	blob \| history
arch/powerpc/mm/pgtable_64.c	diff1 \|	\|	blob \| history
arch/ppc/kernel/time.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/platforms/hdpu.c	diff1 \|	diff2 \|	blob \| history
drivers/char/mem.c	diff1 \|	diff2 \|	blob \| history
drivers/char/viotape.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bmac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ibmveth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/mace.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/video/fbmem.c	diff1 \|	diff2 \|	blob \| history
include/asm-powerpc/rwsem.h	diff1 \|	diff2 \|	blob \| history
include/asm-powerpc/semaphore.h	diff1 \|	diff2 \|	blob \| history
include/asm-powerpc/unistd.h	diff1 \|	diff2 \|	blob \| history
include/asm-ppc64/pgtable.h	diff1 \|	diff2 \|	blob \| history

Linux 2.6 source tree