Merge branch 'master' into for-next

Browse Source

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

...

This commit is contained in:

Jiri Kosina

2012-04-08 21:48:52 +02:00

parent 61282f3792 0034102808

commit e75d660672

10951 changed files with 514814 additions and 339524 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

663

fs/btrfs/disk-io.c

File diff suppressed because it is too large Load Diff