tree 632e690e458fb7b27db200cd6fcd5429e143e419
parent 4c271bb67c04253c1e99006eb48fb773a8fe8c0f
parent 949db153b6466c6f7cad5a427ecea94985927311
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1359176790 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1359176790 -0800

Merge 3.8-rc5 into driver-core-next

This resolves a gpio driver merge issue pointed out in linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>