Merge branch 'master' into for-next (e75d6606) · Commits · github.com / miet-riscv-workgroup / linux

Commit e75d6606 authored Apr 08, 2012 by

Jiri Kosina

Merge branch 'master' into for-next

Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
	drivers/net/ethernet/realtek/r8169.c

parents 61282f37 00341028

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