git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 479b46b 85e2efb)

author	Greg Kroah-Hartman <gregkh@suse.de>
	Thu, 17 Feb 2011 17:56:40 +0000 (09:56 -0800)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Thu, 17 Feb 2011 17:56:55 +0000 (09:56 -0800)
commit	66b0835e2bb3d345f060a47bb8c8f883bd25ec2b
tree	d1fc390dfa58f131df908267d87ef99d4522a596	tree \| snapshot
parent	479b46b5599b1e610630d7332e168c1f9c4ee0b4	commit \| diff
parent	85e2efbb1db9a18d218006706d6e4fbeb0216213	commit \| diff

Merge 2.6.38-rc5 into usb-next

This is needed to resolve some merge conflicts that were found
in the USB host controller patches, and reported by Stephen Rothwell.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

John Crispins staging tree