]> git.karo-electronics.de Git - mv-sheeva.git/commit - fs/squashfs/id.c
Merge branch 'upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 19 May 2010 12:04:49 +0000 (14:04 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 19 May 2010 12:04:49 +0000 (14:04 +0200)
commit7426ef52b42ebd54ba85133ffd29132e008a882c
tree5232ca850065baf025e8d7384408b48b4b462c96
parent537b60d17894b7c19a6060feae40299d7109d6e7
parenta8ab5d58b0238b8199cc699b8dff7c5e1da24138
Merge branch 'upstream' into for-linus

Conflicts:
drivers/hid/hid-wacom.c
drivers/hid/hid-3m-pct.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-wacom.c
drivers/hid/hidraw.c
drivers/hid/usbhid/hid-core.c
drivers/hid/usbhid/hid-quirks.c