]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'acpi/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 02:10:07 +0000 (12:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 02:10:11 +0000 (12:10 +1000)
commitfdc3b3ec2a43a7c66aa584c8bcf6839424089c3c
tree514f27afad9c61cf8d437591eb298fe1c0d8dc70
parente590f2a2ecc19a5eea4c6f890c42324e4be3853d
parent10eaea0474b0078bb84ff9009329b83d3e30337f
Merge remote-tracking branch 'acpi/next'

Conflicts:
drivers/usb/core/usb-acpi.c
drivers/usb/core/usb-acpi.c