Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus

author Jiri Kosina <jkosina@suse.cz>

Mon, 7 Dec 2009 17:30:49 +0000 (18:30 +0100)

committer Jiri Kosina <jkosina@suse.cz>

Mon, 7 Dec 2009 17:30:49 +0000 (18:30 +0100)
author Jiri Kosina <jkosina@suse.cz>
Mon, 7 Dec 2009 17:30:49 +0000 (18:30 +0100)
committer Jiri Kosina <jkosina@suse.cz>
Mon, 7 Dec 2009 17:30:49 +0000 (18:30 +0100)
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
diff --cc drivers/hid/hid-lg.c
Simple merge
diff --cc drivers/hid/usbhid/hid-quirks.c
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Mon, 7 Dec 2009 17:30:49 +0000 (18:30 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Mon, 7 Dec 2009 17:30:49 +0000 (18:30 +0100)
		1	2	3	4
drivers/hid/hid-core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/hid/hid-lg.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/hid/usbhid/hid-quirks.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history