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

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

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f141e74 5878497 682a21f 9b0fabf)

author	Jiri Kosina <jkosina@suse.cz>
	Thu, 4 Jul 2013 13:02:26 +0000 (15:02 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Thu, 4 Jul 2013 13:02:26 +0000 (15:02 +0200)
commit	51e17268688b1a4ccbc958ef81cbe705b3931c45
tree	b39578fe388ab30ba03d4f1dffa9b7be801262d3	tree \| snapshot
parent	f141e7472965347133e2f3be71631532544bf613	commit \| diff
parent	58784974640c5aca6bfbd4cdf8bcf06750733d7f	commit \| diff
parent	682a21fe6e83c77baff83c2ecef60e78ce40844c	commit \| diff
parent	9b0fabfd71b48f84ceef7f3e0704e5e7aeb851b8	commit \| diff

Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into for-linus

Conflicts:
drivers/hid/hid-core.c

drivers/hid/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/hid/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/hid/hid-input.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/hid/hid-multitouch.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history

Linux Kernel Source Tree.