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: a2ad53f 031f2dc)

author	Tony Lindgren <tony@atomide.com>
	Tue, 15 Jan 2008 01:13:45 +0000 (17:13 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 15 Jan 2008 01:13:45 +0000 (17:13 -0800)
commit	4e1618150c58f0d99361ea49f083df8de0ef190d
tree	1f30aa69dede0be3b36ca87b12fba9cec4c23e09	tree \| snapshot
parent	a2ad53fbba35e118e2e524b64466c2be6e94da43	commit \| diff
parent	031f2dcd7075e218e74dd7f942ad015cf82dffab	commit \| diff

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/vfp/vfp.h	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	diff1 \|	diff2 \|	blob \| history
include/linux/i2c-id.h	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history

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