tree 663deacffd4071120dc9badb70428fe5f124c7b9
parent c15895ef30c2c03e99802951787183039a349d32
parent 0cfd81031a26717fe14380d18275f8e217571615
author David Vrabel <david.vrabel@csr.com> 1224515239 +0100
committer David Vrabel <david.vrabel@csr.com> 1224515239 +0100

Merge branch 'master' into for-upstream

Conflicts:

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