pilppa.org Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3856bce 9e566d8)

author	Tony Lindgren <tony@atomide.com>
	Thu, 28 Jul 2005 09:11:35 +0000 (02:11 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 28 Jul 2005 09:11:35 +0000 (02:11 -0700)
commit	05715197e960ebfe966efdbbae4ebb7e5225048e
tree	2824d35455bd047736e907b9fe68d167f73760b1	tree \| snapshot
parent	3856bce7f6699f3a9749124cfb07f9c907c33e9f	commit \| diff
parent	9e566d8bd61f939b7f5d7d969f5b178571471cf9	commit \| diff

Merge with mainline

12 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/char/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/serial/8250.c	diff1 \|	diff2 \|	blob \| history
init/do_mounts.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.