]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 3 Oct 2011 12:01:12 +0000 (14:01 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 3 Oct 2011 12:01:12 +0000 (14:01 +0200)
commitd5f44237790ffa7b44826f81919c95605b552075
tree54560881bb34b1b72cec291bcd6d6e824ec8bc9f
parentdc3cc6b91d1f728ba78f1b6055501d67c4f6e13e
parentd762cc290b9f17e346f4297fd5984b70ce71ef66
Merge branch 'upstream' into for-next

Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-apple.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h