]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: db614fb 4c8a67f)
Merge branch 'driver-core-linus' into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 20 Jun 2013 03:26:43 +0000 (20:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 20 Jun 2013 03:26:43 +0000 (20:26 -0700)
commitfb01ef17b54eadcce9e6aa90dfee00759f9cda41
tree1b708c157ec11f8be7f72b1db3ae3b2f903a760dtree | snapshot
parentdb614fbacbc196fd262d8b99a22496a9fbfcc8d1commit | diff
parent4c8a67f3fa863abbed61fb657cbf426c47820aa1commit | diff
Merge branch 'driver-core-linus' into driver-core-next

This resolves the merge issues with drivers/base/firmware_class.c

Thanks to Ming Lei for the patch and hints on how to resolve it.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/firmware_class.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.