git.baikalelectronics.ru Git - kernel.git/commit

author	Olof Johansson <olof@lixom.net>
	Fri, 28 Jun 2013 00:04:00 +0000 (17:04 -0700)
committer	Olof Johansson <olof@lixom.net>
	Fri, 28 Jun 2013 00:04:00 +0000 (17:04 -0700)
commit	9c35b27024c771cee5ceac70f41448ca0c64b364
tree	d3e963a13fb2c027129c9342a204a430b88c2f90	tree \| snapshot
parent	59222be537aedea1a2cbc22a080681cd33537951	commit \| diff
parent	70a228a13d4fd4cecf130dda2a4e59f9c99b060b	commit \| diff

Merge branch 'msm/fixes' into next/late

Merging in msm/fixes to avoid silly conflicts at top level.

Signed-off-by: Olof Johansson <olof@lixom.net>