Merge master.kernel.org:/home/rmk/linux-2.6-arm

author Linus Torvalds <torvalds@g5.osdl.org>

Fri, 28 Oct 2005 16:24:22 +0000 (09:24 -0700)

committer Linus Torvalds <torvalds@g5.osdl.org>

Fri, 28 Oct 2005 16:24:22 +0000 (09:24 -0700)
author Linus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 16:24:22 +0000 (09:24 -0700)
committer Linus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 16:24:22 +0000 (09:24 -0700)
diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/usb/gadget/pxa2xx_udc.c
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Fri, 28 Oct 2005 16:24:22 +0000 (09:24 -0700)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Fri, 28 Oct 2005 16:24:22 +0000 (09:24 -0700)
		1	2
drivers/net/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/pxa2xx_udc.c	patch \|	diff1 \|	diff2 \|	blob \| history