tree ccb9c107744c10b553c0373e450bee3971d16c00
parent 61282f37927143e45b03153f3e7b48d6b702147a
parent 0034102808e0dbbf3a2394b82b1bb40b5778de9e
author Jiri Kosina <jkosina@suse.cz> 1333914532 +0200
committer Jiri Kosina <jkosina@suse.cz> 1333914532 +0200

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