git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Linus Torvalds <torvalds@g5.osdl.org>
	Mon, 31 Oct 2005 15:32:56 +0000 (07:32 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Mon, 31 Oct 2005 15:32:56 +0000 (07:32 -0800)
commit	4fd5f8267dd37aaebadfabe71d9c808821eea05a
tree	50774592eaba942cf378fca731d307f901b737b7	tree \| snapshot
parent	eb16292ba8a6655a560ab10a7d73a7816f0c0ac0	commit \| diff
parent	8576762ff5d109b841fcf4e7d3883e0cf794f3cf	commit \| diff

Merge kernel.org:/home/rmk/linux-2.6-drvmodel

Manual #include fixups for clashes - there may be some unnecessary

37 files changed:

arch/arm/common/scoop.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/integrator_ap.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/corgi.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/poodle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/spitz.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/jornada720.c	diff1 \|	diff2 \|	blob \| history
arch/mips/au1000/common/platform.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/platforms/chrp_pegasos_eth.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/platforms/ev64360.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/platforms/hdpu.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/platforms/katana.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/platforms/radstone_ppc7d.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/syslib/mv64x60.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/syslib/pq2_devices.c	diff1 \|	diff2 \|	blob \| history
drivers/base/platform.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/pxamci.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/bast-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/ixp2000.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/ixp4xx.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/omap_nor.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/plat-ram.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/sa1100-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/s3c2410.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/pxaficp_ir.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/smsc-ircc2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/mv643xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/au1000_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/pxa2xx_sharpsl.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/sa1100_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/mpsc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-pxa27x.c	diff1 \|	diff2 \|	blob \| history
drivers/video/gbefb.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

arch/arm/common/scoop.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/integrator_ap.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/corgi.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/poodle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/spitz.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/jornada720.c	diff1 \|	diff2 \|	blob \| history
arch/mips/au1000/common/platform.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/platforms/chrp_pegasos_eth.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/platforms/ev64360.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/platforms/hdpu.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/platforms/katana.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/platforms/radstone_ppc7d.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/syslib/mv64x60.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/syslib/pq2_devices.c	diff1 \|	diff2 \|	blob \| history
drivers/base/platform.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/pxamci.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/bast-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/ixp2000.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/ixp4xx.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/omap_nor.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/plat-ram.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/sa1100-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/s3c2410.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/pxaficp_ir.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/smsc-ircc2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/mv643xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/au1000_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/pxa2xx_sharpsl.c	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/sa1100_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/mpsc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-pxa27x.c	diff1 \|	diff2 \|	blob \| history
drivers/video/gbefb.c	diff1 \|	diff2 \|	blob \| history