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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 5ff7f78 4e9687d)

author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Tue, 7 Oct 2008 18:07:22 +0000 (19:07 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 7 Oct 2008 18:07:22 +0000 (19:07 +0100)
commit	1543966a079fc7065849ae43ca4dd767c188ad55
tree	760ddb82836a4e3edf314227c731d5dc181d11a7	tree \| snapshot
parent	5ff7f78a3db462ea4edf1a781a2002d4e8a8a473	commit \| diff
parent	4e9687d9c843dc34d368358a36f5f1610e4fbab3	commit \| diff

Merge branch 'pxa-palm' into pxa-machines

Conflicts:

drivers/mfd/Kconfig
drivers/pcmcia/Makefile

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/pcmcia/Makefile	diff1 \|	diff2 \|	blob \| history

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