Merge branch 'master' into for-upstream
authorDavid Vrabel <david.vrabel@csr.com>
Mon, 20 Oct 2008 15:07:19 +0000 (16:07 +0100)
committerDavid Vrabel <david.vrabel@csr.com>
Mon, 20 Oct 2008 15:07:19 +0000 (16:07 +0100)
commit61e0e79ee3c609eb34edf2fe023708cba6a79b1f
tree663deacffd4071120dc9badb70428fe5f124c7b9
parentc15895ef30c2c03e99802951787183039a349d32
parent0cfd81031a26717fe14380d18275f8e217571615
Merge branch 'master' into for-upstream

Conflicts:

Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Documentation/ABI/testing/sysfs-bus-usb
MAINTAINERS
arch/arm/Kconfig
arch/h8300/Kconfig
drivers/Kconfig
drivers/Makefile