tree 2d1e3b75606abc18df7ad65e51ac3f90cd68b38d
parent c172d82500a6cf3c32d1e650722a1055d72ce858
parent e3bbfa78bab125f58b831b5f7f45b5a305091d72
author Jiri Kosina <jkosina@suse.cz> 1310386548 +0200
committer Jiri Kosina <jkosina@suse.cz> 1310386555 +0200

Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.