diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 11:33:42 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 11:35:11 +0200 |
| commit | 99ce58ddc4eadec8c35d9a1d64ff57703fdcfacc (patch) | |
| tree | 9dbe8427ee72d1aa2fce24a53df2723c3745e2be /arch/arm/mach-pxa/viper.c | |
| parent | Merge branch 'upstream' into for-linus (diff) | |
| parent | HID: logitech: read all 32 bits of report type bitfield (diff) | |
| parent | HID: wacom: fix build breakage without CONFIG_LEDS_CLASS (diff) | |
| parent | HID: waltop: Extend barrel button fix (diff) | |
| download | linux-99ce58ddc4eadec8c35d9a1d64ff57703fdcfacc.tar.xz linux-99ce58ddc4eadec8c35d9a1d64ff57703fdcfacc.zip | |
Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus
Conflicts:
drivers/hid/hid-core.c