CVS Update: 2.3

[Roman Z. <zi...@us...>]

CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/scripts/usb/
Changes by:	zippel@usw-pr-cvs1.	01/01/12 13:05:49

Modified files:
	./: Makefile 
	2.3/Documentation/: Configure.help 
	2.3/arch/ppc/: Makefile config.in 
	2.3/arch/ppc/amiga/: config.c 
	2.3/arch/ppc/kernel/: Makefile apus_setup.c head.S pci.c 
	                      ppc_ksyms.c setup.c time.c 
	2.3/arch/ppc/mm/: init.c 
	2.3/drivers/char/: Makefile 
	2.3/drivers/net/: Makefile 
	2.3/drivers/scsi/: Config.in Makefile 
	2.3/drivers/video/: fbmem.c 
	2.3/fs/affs/: file.c symlink.c 
	2.3/include/asm-ppc/: pgtable.h 
	2.3/mm/: page_alloc.c 
Removed files:
	2.3/BitKeeper/etc/: config logging_ok notify 
	2.3/Documentation/: IO-APIC.txt 
	2.3/Documentation/arm/SA1100/: ThinClient 
	2.3/Documentation/filesystems/devfs/: mk-devlinks modules.conf 
	2.3/arch/alpha/: vmlinux.lds 
	2.3/arch/alpha/lib/: callback_init.c semaphore.S srm_dispatch.S 
	                     srm_fixup.S 
	2.3/arch/arm/boot/compressed/: head-nexuspci.S 
	2.3/arch/arm/def-configs/: thinclient 
	2.3/arch/arm/kernel/: arch.h bios32.h dma-a5k.c dma-dummy.c 
	                      dma-isa.h dma.h hw-footbridge.c 
	                      hw-sa1100.c iic.c ioport.c 
	                      leds-footbridge.c leds-sa1100.c 
	2.3/arch/arm/lib/: io-ebsa110.S io-footbridge.S 
	2.3/arch/arm/mm/: map.h mm-shark.c 
	2.3/arch/i386/kernel/: acpi.c 
	2.3/arch/ia64/dig/: iosapic.c 
	2.3/arch/ia64/kdb/: Makefile kdb_bt.c kdb_io.c kdb_traps.c 
	                    kdbsupport.c pc_keyb.h 
	2.3/arch/ia64/kernel/: irq_internal.c irq_lock.c pci-dma.c 
	                       sal_stub.S 
	2.3/arch/ia64/lib/: idiv.S 
	2.3/arch/m68k/kernel/: m68k_defs.h 
	2.3/arch/mips64/: ld.script.elf32 
	2.3/arch/ppc/8xx_io/: micropatch.c usb.c 
	2.3/arch/ppc/coffboot/: main.c 
	2.3/arch/ppc/configs/: gemini_defconfig 
	2.3/arch/ppc/kernel/: gemini_pci.c gemini_prom.S gemini_setup.c 
	                      temp.c time.h 
	2.3/arch/ppc/mbxboot/: mbxtty.c vmlinux.lds 
	2.3/arch/sh/kernel/: irq_onchip.c 
	2.3/arch/sparc/kernel/: solaris.c 
	2.3/drivers/acpi/: osd.c tables.c 
	2.3/drivers/acpi/include/: actbl32.h actbl64.h common.h config.h 
	                           debugger.h dispatch.h events.h 
	                           globals.h hardware.h internal.h 
	                           interp.h macros.h namesp.h output.h 
	                           parser.h resource.h tables.h 
	2.3/drivers/acpi/interpreter/: amdump.c 
	2.3/drivers/acpi/namespace/: nsdump.c 
	2.3/drivers/acpi/parser/: psfind.c 
	2.3/drivers/acpi/tables/: tbtable.c 
	2.3/drivers/block/: linear.c lvm-snap.c lvm.c md.c raid0.c 
	                    raid1.c raid5.c xor.c 
	2.3/drivers/char/: audiochip.h bt848.h bttv-cards.c 
	                   bttv-driver.c bttv-if.c bttv.c bttv.h buz.c 
	                   buz.h bw-qcam.c bw-qcam.h c-qcam.c cpia.c 
	                   cpia.h cpia_pp.c cpia_usb.c cs8420.h 
	                   i2c-old.c i2c-parport.c ibmmpeg2.h msp3400.c 
	                   planb.c planb.h pms.c radio-aimslab.c 
	                   radio-aztech.c radio-cadet.c radio-gemtek.c 
	                   radio-miropcm20.c radio-rtrack2.c 
	                   radio-sf16fmi.c radio-terratec.c 
	                   radio-trust.c radio-typhoon.c radio-zoltrix.c 
	                   saa5249.c saa7110.c saa7111.c saa7121.h 
	                   saa7146.h saa7146reg.h saa7185.c saa7196.h 
	                   stradis.c tda7432.c tda8425.c tda985x.c 
	                   tda9875.c tea6300.c tea6420.c tuner-3036.c 
	                   tuner.c tuner.h tvmixer.c videodev.c vino.c 
	                   zr36057.h zr36060.h zr36120.c zr36120.h 
	                   zr36120_i2c.c zr36120_mem.c zr36120_mem.h 
	2.3/drivers/char/drm/: picker.c r128_dma.c 
	2.3/drivers/char/joystick/: joy-amiga.c joy-analog.c 
	                            joy-analog.h joy-assassin.c 
	                            joy-console.c joy-creative.c 
	                            joy-db9.c joy-gravis.c 
	                            joy-lightning.c joy-logitech.c 
	                            joy-magellan.c joy-pci.c 
	                            joy-sidewinder.c joy-spaceball.c 
	                            joy-spaceorb.c joy-thrustmaster.c 
	                            joy-turbografx.c joy-warrior.c 
	                            joystick.c 
	2.3/drivers/i2c/: i2c-algo-8xx.c i2c-rpx.c 
	2.3/drivers/ide/: aec6210.c 
	2.3/drivers/input/: adbhid.c hid-debug.h hid.c hid.h iforce.c 
	                    usbkbd.c usbmouse.c wacom.c 
	2.3/drivers/isdn/avmb1/: b1capi.c b1lli.c 
	2.3/drivers/isdn/hisax/: foreign.c foreign.h teles3c.c 
	2.3/drivers/media/video/: stallion.c tda8425.c tda985x.c 
	                          tea6300.c tea6420.c 
	2.3/drivers/net/: ncr885_debug.h ncr885e.c ncr885e.h skeleton.c 
	2.3/drivers/net/hamradio/: 6pack.h pi2.c pt.c 
	2.3/drivers/net/pcmcia/: 3c575_cb.c 
	2.3/drivers/sound/: awacs_defs.h dmasound.c dmasound.h softoss.c 
	                    softoss.h softoss_rs.c soundmodule.h 
	2.3/drivers/sound/emu10k1/: efxmgr.c osutils.c 
	2.3/drivers/usb/: adbhid.c evdev.c iforce.c input.c joydev.c 
	                  keybdev.c m8xxhci.c mousedev.c plusb.h 
	                  usb-core.c usb-storage-debug.h usb-storage.c 
	                  usb-storage.h usbdevice_fs.h wmforce.c 
	2.3/drivers/usb/storage/: scm.c scm.h 
	2.3/drivers/video/: sisfb.c vga_font.c 
	2.3/fs/minix/: truncate.c 
	2.3/include/asm-alpha/: semaphore-helper.h 
	2.3/include/asm-arm/: dec21285.h ioc.h iomd.h memc.h 
	2.3/include/asm-arm/arch-arc/: processor.h 
	2.3/include/asm-arm/arch-cl7500/: processor.h 
	2.3/include/asm-arm/arch-ebsa285/: processor.h 
	2.3/include/asm-arm/arch-l7200/: processor.h 
	2.3/include/asm-arm/arch-nexuspci/: processor.h 
	2.3/include/asm-arm/arch-rpc/: processor.h 
	2.3/include/asm-arm/arch-shark/: processor.h 
	2.3/include/asm-arm/arch-tbox/: processor.h 
	2.3/include/asm-arm/proc-armo/: io.h semaphore.h 
	2.3/include/asm-arm/proc-armv/: io.h 
	2.3/include/asm-ia64/: kdbsupport.h 
	2.3/include/asm-mips/: highmem.h offset.h 
	2.3/include/asm-mips64/: highmem.h ioc3.h offset.h 
	2.3/include/asm-ppc/: gemini.h gemini_serial.h 
	2.3/include/asm-sparc/: asm_offsets.h atops.h ethtool.h md.h 
	                        semaphore-helper.h 
	2.3/include/asm-sparc64/: asm_offsets.h ethtool.h machines.h 
	                          md.h 
	2.3/include/linux/: coda_opstats.h dmascc.h i2c-algo-8xx.h 
	                    openpic.h raid1.h raid5.h 
	2.3/include/net/: atalkcall.h ax25call.h decnet_call.h ipxcall.h 
	                  lapbcall.h llccall.h netbeuicall.h nrcall.h 
	                  p8022call.h psnapcall.h rosecall.h slhc.h 
	                  spxcall.h x25call.h 
	2.3/net/: protocols.c 
	2.3/net/atm/: lane_mpoa_init.c 
	2.3/net/irda/: irmod.c 
	2.3/scripts/usb/: procusb usbtree 

Log message:
	conflict fixes from import bitkeeper (2.4.0)