Merge branch 'master' into staging-next (cc11f372) · Commits · github.com / kvm-riscv / linux

Commit cc11f372 authored Jan 27, 2014 by

Greg Kroah-Hartman

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>

parents 5b4af8b6 77d143de

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment