projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5b4af8b 77d143d)
Merge branch 'master' into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jan 2014 13:44:53 +0000 (05:44 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jan 2014 13:44:53 +0000 (05:44 -0800)
commitcc11f372e9371ec3a3dad02396dbe0a55eec0b8f
treefd22bdac975ee61053e787ad96c912fddc485370tree | snapshot
parent5b4af8b6397c2da6e3c05893d974b6559441901dcommit | diff
parent77d143de75812596a58d126606f42d1214e09ddecommit | 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>
Domain: System / Kernel;