Merge 3.6-rc7 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Sep 2012 23:51:27 +0000 (16:51 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Sep 2012 23:51:27 +0000 (16:51 -0700)
commit8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e
tree88cd7852d59ebae54fcc2f57019ea13284042962
parent6f586e663e3b3674cadad0d5329424b006a0a289
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2
Merge 3.6-rc7 into driver-core-next

This pulls in the fixes in that branch that are needed here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/extcon/extcon-max77693.c