projects / profile / ivi / kernel-x86-ivi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bb07b00 8759793)
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)
commit7068cb07563d8f001e83a2836ccf1cef6518aea4
tree1b708c157ec11f8be7f72b1db3ae3b2f903a760dtree | snapshot
parentbb07b00be77fb33274cb44a03bdbf2471e556189commit | diff
parent875979368eb4cfecff9f0e97625b90cc6009269dcommit | 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
Domain: System / Uncategorized;