diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:09:31 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:09:31 +0200 |
| commit | 896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 (patch) | |
| tree | 42f625d04b9fbff4cb93968f18efd91601df15a5 /arch/mips/kernel/mips-mt-fpaff.c | |
| parent | Merge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend' into for-linus (diff) | |
| parent | HID: Support for the 11.6" Cando panel (diff) | |
| download | linux-dev-896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68.tar.xz linux-dev-896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68.zip | |
Merge branch 'cando' into for-linus
Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
Diffstat (limited to 'arch/mips/kernel/mips-mt-fpaff.c')
0 files changed, 0 insertions, 0 deletions