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: c15895e 0cfd810)

author	David Vrabel <david.vrabel@csr.com>
	Mon, 20 Oct 2008 15:07:19 +0000 (16:07 +0100)
committer	David Vrabel <david.vrabel@csr.com>
	Mon, 20 Oct 2008 15:07:19 +0000 (16:07 +0100)
commit	61e0e79ee3c609eb34edf2fe023708cba6a79b1f
tree	663deacffd4071120dc9badb70428fe5f124c7b9	tree \| snapshot
parent	c15895ef30c2c03e99802951787183039a349d32	commit \| diff
parent	0cfd81031a26717fe14380d18275f8e217571615	commit \| diff

Merge branch 'master' into for-upstream

Conflicts:

Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile

Documentation/ABI/testing/sysfs-bus-usb	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/h8300/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history

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