Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 11 Nov 2005 17:24:26 +0000 (09:24 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 11 Nov 2005 17:24:26 +0000 (09:24 -0800)
commit5643f000c1e10ab991182478b76550e1364c3570
tree950b2f61a5dd742de1c668ba968a9c8a99f1eab6
parent177294d19174cf92de22434bb1fc9a8ecdbbe658
parent3ae5eaec1d2d9c0cf53745352e7d4b152810ba24
Merge kernel.org:/home/rmk/linux-2.6-drvmodel
12 files changed:
arch/arm/mach-pxa/corgi_ssp.c
arch/um/drivers/net_kern.c
arch/xtensa/platform-iss/network.c
drivers/hwmon/hdaps.c
drivers/misc/hdpuftrs/hdpu_cpustate.c
drivers/misc/hdpuftrs/hdpu_nexus.c
drivers/mmc/wbsd.c
drivers/net/dm9000.c
drivers/net/gianfar.c
drivers/usb/gadget/dummy_hcd.c
drivers/usb/gadget/pxa2xx_udc.c
drivers/video/backlight/corgi_bl.c