Public Git Hosting - hh.org.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 221e2f3 2b5f6dc)

commit	c3470c53d7cb9f1c4ccff87c7cf64624acb11f1a
author	Ian <ian@wirenth.(none)>
	Mon, 4 Dec 2006 01:31:13 +0000 (4 01:31 +0000)
committer	Ian <ian@wirenth.(none)>
	Mon, 4 Dec 2006 01:31:13 +0000 (4 01:31 +0000)
tree	8aec839ba2c10bbfc1a84ce5dfb4e1050071290f	tree \| snapshot (tar.gz zip)
parent	221e2f3ff89c09f5ddc73de07cee81e079e58937	commit \| diff
parent	2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2	commit \| diff

pull master

Conflicts:

drivers/usb/gadget/pxa2xx_udc.c

15 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2410/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/base/bus.c	diff1 \|	diff2 \|	blob \| history
drivers/base/platform.c	diff1 \|	diff2 \|	blob \| history
drivers/char/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mmc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/scsi/aic94xx/aic94xx_reg_def.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/ether.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/pxa2xx_udc.c	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
include/linux/ioport.h	diff1 \|	diff2 \|	blob \| history
include/linux/kexec.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/Kconfig	diff1 \|	diff2 \|	blob \| history

hh.org GIT migration