| commit | 3eb9992caff10b62cf0ed0bcb1667a58b13188fa | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Apr 22 10:08:40 2014 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Apr 22 10:08:40 2014 -0700 |
| tree | abe4b4b586978773e2df21898eda611bc6eb822c | |
| parent | e347fa5f4271769bc31fb462631c213aa3824588 [diff] | |
| parent | a798c10faf62a505d24e5f6213fbaf904a39623f [diff] |
Merge 3.15-rc2 into staging-next This resolves a bunch of merge errors with other fixes that are already in Linus's tree. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>