git.stricted.de - GitHub/moto-9609/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 57ab12e 71b38bd)

author	Jiri Kosina <jkosina@suse.cz>
	Thu, 25 Feb 2010 16:39:16 +0000 (17:39 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Thu, 25 Feb 2010 16:39:16 +0000 (17:39 +0100)
commit	14ef2b0c026558d37662e5e095d59c64597d5769
tree	230c09cc65bc94384c687fed87e6ada954f80609	tree \| snapshot (tar.gz zip)
parent	57ab12e418ec4fe24c11788bb1bbdabb29d05679	commit \| diff
parent	71b38bd4c1cc4f2b653064357e4efab77dfd711d	commit \| diff

Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus

Conflicts:
drivers/hid/Kconfig

drivers/hid/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hid/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-sony.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/usbhid/hid-core.c	diff1 \|	diff2 \|	blob \| history
include/linux/hid.h	diff1 \|	diff2 \|	blob \| history