summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-08-0520-196/+586
|\
| * Merge branch 'bkl' into for-linusJiri Kosina2010-08-041-42/+12
| |\
| | * HID: hiddev: use usb_find_interface, get rid of BKLArnd Bergmann2010-07-131-42/+12
| | |
| | \
| | \
| | \
| *---. \ Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linusJiri Kosina2010-08-0411-75/+99
| |\ \ \ \
| | | | * | HID: Force input registration for "VEC footpedal"Daniel Mack2010-07-192-0/+4
| | | | * | HID: add HID_QUIRK_HIDINPUT_FORCEDaniel Mack2010-07-192-0/+3
| | | | * | HID: hid-input.c: indentation fixesDaniel Mack2010-07-191-9/+9
| | | | |/
| | | * | HID: roccat: remove obsolete kone_abi_version sysfs attributeStefan Achatz2010-06-213-30/+0
| | | * | HID: roccat: fix offset errors in bin_attribute readStefan Achatz2010-06-211-2/+2
| | | * | HID: roccat: introduce missing kfreeJulia Lawall2010-06-021-3/+6
| | | * | HID: roccat: change kone_driver_version to kone_abi_versionStefan Achatz2010-05-313-11/+10
| | | * | HID: roccat: fix whitespace warning from checkpatch.plStefan Achatz2010-05-311-1/+1
| | | * | HID: roccat: remove obsolete commentStefan Achatz2010-05-311-5/+0
| | * | | HID: magicmouse: Correct parsing of large X and Y motions.Michael Poole2010-07-111-2/+2
| | * | | HID: magicmouse: report last touch upChase Douglas2010-07-111-2/+20
| | * | | HID: magicmouse: enable horizontal scrollingChase Douglas2010-06-241-6/+19
| | * | | HID: magicmouse: add param for scroll speedChase Douglas2010-06-241-15/+28
| | * | | HID: magicmouse: properly account for scroll movement in stateChase Douglas2010-06-241-1/+2
| | * | | HID: magicmouse: disable and add module param for scroll accelerationChase Douglas2010-06-041-1/+7
| | * | | HID: magicmouse: scroll on entire surface, not just middle of mouseChase Douglas2010-06-041-3/+2
| | |/ /
| * | | Merge branch 'acrux' into for-linusJiri Kosina2010-08-045-1/+187
| |\ \ \
| | * | | HID: fix up Kconfig entry for ACRUX driverJiri Kosina2010-07-191-1/+0
| | * | | HID: add ACRUX game controller force feedback supportSergei Kolzun2010-07-195-0/+187
| | | |/ | | |/|
| * | | Merge branch 'upstream-fixes' into for-linusJiri Kosina2010-08-045-8/+16
| |\ \ \
| | * | | Revert "HID: add support for the Wacom Intuos 4 wireless"Jiri Kosina2010-07-203-3/+1
| | * | | HID: Add support for Conceptronic CLLRCMCEKees Bakker2010-07-134-2/+12
| | |/ /
| * | | Merge branch 'upstream' into for-linusJiri Kosina2010-08-048-74/+276
| |\ \ \ | | |/ / | |/| |
| | * | HID: ignore digitizer usage Undefined (0x00)Forest Bond2010-07-131-0/+3
| | * | HID: hid-ids.h: Whitespace fixup, align using TABsKees Bakker2010-07-121-20/+20
| | * | HID: picolcd: implement refcounting of framebufferBruno Prémont2010-07-121-7/+103
| | * | HID: picolcd: do not reallocate memory on depth changeBruno Prémont2010-07-121-15/+12
| | * | HID: picolcd: Add minimal palette required by fbcon on 8bppBruno Prémont2010-07-121-11/+51
| | * | HID: picolcd: fix deferred_io init/cleanup to fb orderingBruno Prémont2010-07-111-2/+2
| | * | HID: hid-ids.h: keep vendor ids in alphabetical orderKees Bakker2010-07-111-21/+21
| | * | HID: add proper support for Elecom BM084 bluetooth mouseRichard Nauber2010-06-285-0/+68
| | * | HID: remove unused variable from hidraw_readStefan Achatz2010-05-251-2/+0
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2010-08-0523-707/+1306
|\ \ \ \
| * | | | random: Reorder struct entropy_store to remove padding on 64bits Richard Kennedy2010-07-311-1/+1
| * | | | padata: update API documentationSteffen Klassert2010-07-311-12/+64
| * | | | padata: Remove padata_get_cpumaskSteffen Klassert2010-07-312-37/+0
| * | | | crypto: pcrypt - Update pcrypt cpumask according to the padata cpumask notifierSteffen Klassert2010-07-311-2/+11
| * | | | crypto: pcrypt - Rename pcrypt_instanceSteffen Klassert2010-07-311-16/+14
| * | | | padata: Pass the padata cpumasks to the cpumask_change_notifier chainSteffen Klassert2010-07-312-20/+23
| * | | | padata: Rearrange set_cpumask functionsSteffen Klassert2010-07-312-53/+70
| * | | | padata: Rename padata_alloc functionsSteffen Klassert2010-07-313-17/+18
| * | | | crypto: pcrypt - Dont calulate a callback cpu on empty callback cpumaskSteffen Klassert2010-07-261-0/+3
| * | | | padata: Check for valid cpumasksSteffen Klassert2010-07-261-1/+1
| * | | | padata: Allocate cpumask dependend recources in any caseSteffen Klassert2010-07-261-17/+7
| * | | | padata: Fix cpu index countingSteffen Klassert2010-07-261-0/+1
| * | | | crypto: geode_aes - Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID i...Peter Huewe2010-07-191-1/+1