git.ipfire.org Git - people/ms/linux.git/commit

]> git.ipfire.org Git - people/ms/linux.git/commit

projects / people / ms / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: db58316 adb91ae 078328d 3685c18)

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	08ec2dcc3527a20c619aca2fb36f800908256bac
tree	b39578fe388ab30ba03d4f1dffa9b7be801262d3	tree \| snapshot
parent	db58316892a5e9034efe718d4c1630788db7528f	commit \| diff
parent	adb91aef9f9965341a9252bd610b5d828d5c016f	commit \| diff
parent	078328da5d5dfbd2b1333eb545bd89d6dfa984ef	commit \| diff
parent	3685c18e17f12438d0a83331c1b6a5b00fade7a1	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

Michael's Linux tree.