commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff | [log] [tgz] |
---|---|---|
author | Jiri Kosina <jkosina@suse.cz> | Tue Apr 26 10:22:15 2011 +0200 |
committer | Jiri Kosina <jkosina@suse.cz> | Tue Apr 26 10:22:59 2011 +0200 |
tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 | |
parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf [diff] | |
parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c [diff] |
Merge branch 'master' into for-next Fast-forwarded to current state of Linus' tree as there are patches to be applied for files that didn't exist on the old branch.