| commit | cc11f372e9371ec3a3dad02396dbe0a55eec0b8f | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jan 27 05:44:53 2014 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jan 27 05:44:53 2014 -0800 |
| tree | fd22bdac975ee61053e787ad96c912fddc485370 | |
| parent | 5b4af8b6397c2da6e3c05893d974b6559441901d [diff] | |
| parent | 77d143de75812596a58d126606f42d1214e09dde [diff] |
Merge branch 'master' into staging-next We need the network changes in staging-next in order to be able to fix up the rtl8821ae driver to build properly. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>