review.tizen.org Git - platform/kernel/linux-exynos.git/commit

projects / platform / kernel / linux-exynos.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 84a1caf 1a49e2a)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 16 Jul 2012 20:16:09 +0000 (13:16 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 16 Jul 2012 20:16:09 +0000 (13:16 -0700)
commit	b903bd69e3fa156598def8d6433dfe5352af8da3
tree	a13380f31bab62acfd667910656525c09511cb8a	tree \| snapshot
parent	84a1caf1453c3d44050bd22db958af4a7f99315c	commit \| diff
parent	1a49e2ac9651df7349867a5cf44e2c83de1046af	commit \| diff

Merge 3.5-rc7 into usb-next

This resolves the merge issue with the drivers/usb/host/ehci-omap.c
file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/class/cdc-wdm.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;