diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:04:49 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:04:49 +0200 |
| commit | 7426ef52b42ebd54ba85133ffd29132e008a882c (patch) | |
| tree | 5232ca850065baf025e8d7384408b48b4b462c96 /arch/mips/kernel/mips-mt-fpaff.c | |
| parent | Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | HID: hidraw: Use Interrupt Endpoint for OUT Transfers if Available (diff) | |
| download | linux-dev-7426ef52b42ebd54ba85133ffd29132e008a882c.tar.xz linux-dev-7426ef52b42ebd54ba85133ffd29132e008a882c.zip | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-wacom.c
Diffstat (limited to 'arch/mips/kernel/mips-mt-fpaff.c')
0 files changed, 0 insertions, 0 deletions