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

author	Dmitry Torokhov <dmitry.torokhov@gmail.com>
	Sat, 24 Nov 2012 08:02:54 +0000 (00:02 -0800)
committer	Dmitry Torokhov <dmitry.torokhov@gmail.com>
	Sat, 24 Nov 2012 08:02:54 +0000 (00:02 -0800)
commit	8910999dcd46dcb82236129f1c1ad7d8b2b2affe
tree	c5aa57e70d901ae05b25e61387a351e6b0b2826b	tree \| snapshot
parent	eef4c9f4de4f2746c88a3d21e9e3f658c8c85b3c	commit \| diff
parent	2e5a5b729470dda2e9bb883cafab44fd493a5ef4	commit \| diff

Merge branch 'for-linus' into next

Bring in changes to ads7846 to avoid mereg conflicts.