| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Sun Apr 08 21:48:52 2012 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Sun Apr 08 21:48:52 2012 +0200 |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 | |
| parent | 61282f37927143e45b03153f3e7b48d6b702147a [diff] | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e [diff] |
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