tree 0676cf38df3844004bb3ebfd99dfa67a4a8998f5
parent 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf
parent cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c
author Jiri Kosina <jkosina@suse.cz> 1303806135 +0200
committer Jiri Kosina <jkosina@suse.cz> 1303806179 +0200

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.