summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | staging: csr: remove odd pointer typedefsGreg Kroah-Hartman2012-07-202-7/+2
| * | | staging: csr: remove CsrSize typedefGreg Kroah-Hartman2012-07-2028-1491/+1490
| * | | staging: csr: remove CsrBool typedefGreg Kroah-Hartman2012-07-2038-267/+264
| * | | staging: csr: remove CsrCharString typedefGreg Kroah-Hartman2012-07-2045-301/+298
| * | | staging: csr: remove CsrUtf8String typedefGreg Kroah-Hartman2012-07-205-38/+37
| * | | staging: csr: remove CsrUtf16String typedefGreg Kroah-Hartman2012-07-205-70/+69
| * | | staging: csr: remove CsrUint24 typedefGreg Kroah-Hartman2012-07-203-4/+3
| * | | staging: csr: remove CsrInt32 typedefGreg Kroah-Hartman2012-07-2033-139/+136
| * | | staging: csr: remove CsrUint32 typedefGreg Kroah-Hartman2012-07-2066-868/+865
| * | | staging: csr: remove CsrInt16 typedefGreg Kroah-Hartman2012-07-2022-137/+136
| * | | staging: csr: remove CsrUint16 typedefGreg Kroah-Hartman2012-07-20104-2805/+2804
| * | | staging: csr: remove CsrInt8 typedefGreg Kroah-Hartman2012-07-2014-45/+44
| * | | staging: csr: remove CsrUint8 typedefGreg Kroah-Hartman2012-07-2077-2505/+2504
| * | | staging: csr: clean up csr_types.h a bitGreg Kroah-Hartman2012-07-201-24/+1
| * | | staging: csr: remove sdioemb/Greg Kroah-Hartman2012-07-2023-4016/+0
OpenPOWER on IntegriCloud