git.alex.org.uk - linux-flexiantxendom0-3.2.10.git/commit

projects / linux-flexiantxendom0-3.2.10.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bc633e9 cf44e79)

author	Greg Kroah-Hartman <greg@kroah.com>
	Thu, 30 Sep 2004 03:00:42 +0000 (20:00 -0700)
committer	Greg Kroah-Hartman <greg@kroah.com>
	Thu, 30 Sep 2004 03:00:42 +0000 (20:00 -0700)
commit	b7db7c7b8226cb7af00f674fd98235ef20b11224
tree	c396bfee96f604f761fb776d276c28475f3a43cf	tree \| snapshot
parent	bc633e90bf3ef39b798e2cc417a890a9f72e95cd	commit \| diff
parent	cf44e793f222c3ff75f8608e5337dca96b910f1a	commit \| diff

Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/usb-2.6

16 files changed:

CREDITS	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/pxa27x.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/class/bluetty.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/class/cdc-acm.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/net2280.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/pxa2xx_udc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/digi_acceleport.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/empeg.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/io_edgeport.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/io_ti.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/ir-usb.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/keyspan_pda.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/mct_u232.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/usb-serial.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/whiteheat.c	diff1 \|	diff2 \|	blob \| history

Port of xen3.3 xenlinux code to Ubuntu packaged SUSE kernel (3.2.10)