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	9564642c21aa35117ef7bb333e3d13304bb4fc22
tree	c5aa57e70d901ae05b25e61387a351e6b0b2826b	tree \| snapshot
parent	ba080869c5da2ad9fff6dbdcda760901c2fa21e5	commit \| diff
parent	0be1ad8c69e842393850acdd97647edb4ed5684c	commit \| diff

Merge branch 'for-linus' into next

Bring in changes to ads7846 to avoid mereg conflicts.