diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-18 16:34:14 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-18 16:34:14 (GMT) |
| commit | c45bb8cb72136bf23d18926113bff04c8cc90813 (patch) | |
| tree | ae49a32f9c2536383c50d426c2eba1c7da1f22cf /drivers/power | |
| parent | a14592896023adcab12307774c89284ce0744ce2 (diff) | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
| download | linux-fsl-qoriq-c45bb8cb72136bf23d18926113bff04c8cc90813.tar.xz | |
Merge 3.9-rc3 into staging-next
This resolves the merge error due to removing the ccg staging driver,
and picks up the other staging driver fixes that went into 3.9-rc3.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/power')
0 files changed, 0 insertions, 0 deletions