www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/cbus/retu-pwrbutton.c

]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/cbus/retu-pwrbutton.c

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 8263e81 721d5df)

author	Tony Lindgren <tony@atomide.com>
	Fri, 31 Oct 2008 21:27:36 +0000 (14:27 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Fri, 31 Oct 2008 21:27:36 +0000 (14:27 -0700)
commit	946deb792b95c6a263ceffddf61885c1dad2012b
tree	a9e6c9573475e6276bb4c6d57b1a167eba13e3a8	tree \| snapshot
parent	8263e811bb17f734444691c5a34197034d64e1c3	commit \| diff
parent	721d5dfe7e516954c501d5e9d0dfab379cf4241a	commit \| diff

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history

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