projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge