summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpcLinus Torvalds2012-08-021-0/+1
|\
| * drivers: OLPC: update various drivers to include olpc-ec.hAndres Salomon2012-07-311-0/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-08-013-43/+17
|\ \
| * | slightly reduce lossage in gdm72xxAl Viro2012-07-292-17/+12
| * | slightly reduce idiocy in drivers/staging/bcm/Misc.cAl Viro2012-07-291-26/+5
* | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-07-314-27/+4
|\ \ \ | |_|/ |/| |
| * | [media] staging/media/solo6x10: use module_pci_driver macroDevendra Naga2012-07-301-12/+1
| * | [media] staging/media/dt3155v4l: use module_pci_driver macroDevendra Naga2012-07-301-14/+1
| * | [media] lirc: fix non-ANSI function declaration warningEmil Goode2012-07-301-1/+1
| * | [media] drivers/staging/media/easycap/easycap_main.c: add missing usb_free_urbJulia Lawall2012-07-301-0/+1
* | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-07-303-4/+60
|\| |
| * | [media] staging: solo6x10: Fix TODO file with proper maintainerEzequiel GarcĂ­a2012-07-051-1/+1
| * | Merge branch 'v4l_for_linus' into staging/for_v3.6Mauro Carvalho Chehab2012-06-271-0/+6
| |\ \
| * | | [media] staging: solo6x10: fix | vs &Dan Carpenter2012-06-181-1/+1
| * | | [media] lirc_sir: make device registration workJarod Wilson2012-06-181-2/+58
* | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-07-303-67/+117
|\ \ \ \
| * | | | staging: octeon_ethernet: Convert to use device tree.David Daney2012-07-233-67/+117
| | |_|/ | |/| |
* | | | Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2012-07-262-2/+2
|\ \ \ \
| * | | | Merge tag 'v3.5-rc7' into drm-nextDave Airlie2012-07-201-0/+6
| |\| | |
| * | | | drm: Make the .mode_fixup() operations mode argument a const pointerLaurent Pinchart2012-07-192-2/+2
* | | | | Merge tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-07-26604-29427/+114545
|\ \ \ \ \
| * | | | | staging: csr: delete a bunch of unused library functionsGreg Kroah-Hartman2012-07-206-616/+1
| * | | | | staging: csr: remove csr_utf16.cGreg Kroah-Hartman2012-07-2010-1155/+28
| * | | | | staging: csr: remove csr_pmem.hGreg Kroah-Hartman2012-07-2036-134/+1
| * | | | | staging: csr: remove CsrPmemAllocGreg Kroah-Hartman2012-07-2026-605/+534
| * | | | | staging: csr: remove CsrPmemFree()Greg Kroah-Hartman2012-07-2023-303/+282
| * | | | | staging: csr: remove CsrMemAllocDma()Greg Kroah-Hartman2012-07-205-53/+4
| * | | | | staging: csr: remove CsrMemCalloc()Greg Kroah-Hartman2012-07-202-52/+0
| * | | | | staging: csr: remove CsrMemAlloc()Greg Kroah-Hartman2012-07-207-62/+12
| * | | | | staging: csr: remove CsrMemFree() and CsrMemFreeDma()Greg Kroah-Hartman2012-07-208-107/+30
| * | | | | staging: csr: remove csr_util.hGreg Kroah-Hartman2012-07-2019-36/+18
| * | | | | staging: csr: remove CsrOffSetOf()Greg Kroah-Hartman2012-07-202-107/+96
| * | | | | stating: csr: remove unneeded #includes in csr_util.cGreg Kroah-Hartman2012-07-201-5/+0
| * | | | | staging: csr: make CsrUInt16ToHex staticGreg Kroah-Hartman2012-07-203-23/+16
| * | | | | staging: csr: remove CsrMemCpy()Greg Kroah-Hartman2012-07-2015-97/+77
| * | | | | staging: csr: remove CsrStrLen()Greg Kroah-Hartman2012-07-207-29/+19
| * | | | | staging: csr: remove CsrVsnprintf()Greg Kroah-Hartman2012-07-204-9/+2
| * | | | | staging: csr: remove CsrStrDupGreg Kroah-Hartman2012-07-205-47/+2
| * | | | | staging: csr: remove CsrStrChr()Greg Kroah-Hartman2012-07-202-7/+0
| * | | | | staging: csr: remove CsrStrNCmpGreg Kroah-Hartman2012-07-204-13/+0
| * | | | | staging: csr: remove CsrStrCmpGreg Kroah-Hartman2012-07-204-13/+0
| * | | | | staging: csr: remove CsrStrNcpyGreg Kroah-Hartman2012-07-204-122/+0
| * | | | | staging: csr: remove CsrStrCpyGreg Kroah-Hartman2012-07-205-37/+1
| * | | | | staging: csr: remove CsrMemMove()Greg Kroah-Hartman2012-07-202-8/+0
| * | | | | staging: csr: remove CsrMemCmpGreg Kroah-Hartman2012-07-203-9/+1
| * | | | | staging: csr: remove CsrMemSetGreg Kroah-Hartman2012-07-208-20/+12
| * | | | | staging: csr: remove a bunch of unused functions in csr_util.cGreg Kroah-Hartman2012-07-202-352/+0
| * | | | | staging: csr: remove indications.cGreg Kroah-Hartman2012-07-202-19/+0
| * | | | | staging: csr: remove csr_types.hGreg Kroah-Hartman2012-07-2062-100/+22
| * | | | | staging: csr: remove CsrUint64 and CsrInt64 typedefs.Greg Kroah-Hartman2012-07-202-17/+4