Merge ../linux-2.6 by hand
authorPaul Mackerras <paulus@samba.org>
Mon, 31 Oct 2005 02:37:12 +0000 (13:37 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 31 Oct 2005 02:37:12 +0000 (13:37 +1100)
commit23fd07750a789a66fe88cf173d52a18f1a387da4
tree06fdd6df35fdb835abdaa9b754d62f6b84b97250
parentbd787d438a59266af3c9f6351644c85ef1dd21fe
parented28f96ac1960f30f818374d65be71d2fdf811b0
Merge ../linux-2.6 by hand
15 files changed:
arch/powerpc/mm/mem.c
arch/powerpc/mm/pgtable_64.c
arch/ppc/kernel/time.c
arch/ppc/platforms/hdpu.c
drivers/char/mem.c
drivers/char/viotape.c
drivers/net/bmac.c
drivers/net/ibmveth.c
drivers/net/mace.c
drivers/pcmcia/Makefile
drivers/video/fbmem.c
include/asm-powerpc/rwsem.h
include/asm-powerpc/semaphore.h
include/asm-powerpc/unistd.h
include/asm-ppc64/pgtable.h