git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

projects / ceph-client.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b3d07e0 d125708)

author	Jiri Kosina <jkosina@suse.cz>
	Tue, 22 May 2012 09:32:31 +0000 (11:32 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Tue, 22 May 2012 09:32:31 +0000 (11:32 +0200)
commit	56ccd186f1837dd418cd094f0e96b3196bbab9ef
tree	195cdd3973a1288eb84f51f0ec28a947b333c2c5	tree \| snapshot
parent	b3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e	commit \| diff
parent	d1257081aecf44455fcab8675f1d54e8b242faa1	commit \| diff

Merge branch 'upstream' into for-linus

Conflicts:
drivers/hid/hid-core.c

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/usbhid/hid-core.c	diff1 \|	diff2 \|	blob \| history
include/linux/hid.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.