summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Expand)AuthorAgeFilesLines
* Documentation: remove references to /etc/modprobe.confLucas De Marchi2012-03-301-1/+1
* Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-03-291-7/+6
|\
| * fs: Remove missed ->fds_bits from cessation use of fd_set structs internallyDavid Howells2012-02-241-2/+1
| * Wrap accesses to the fd_sets in struct fdtableDavid Howells2012-02-191-5/+5
* | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-2824-25/+6
|\ \
| * | Remove all #inclusions of asm/system.hDavid Howells2012-03-2823-25/+4
| * | Add #includes needed to permit the removal of asm/system.hDavid Howells2012-03-281-0/+2
* | | Merge git://www.linux-watchdog.org/linux-watchdogLinus Torvalds2012-03-281-0/+1
|\ \ \
| * | | watchdog: fix set_timeout operationsWim Van Sebroeck2012-03-271-0/+1
* | | | Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-281-1/+1
|\ \ \ \ | |/ / / |/| | |
* | | | Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/p...Linus Torvalds2012-03-241-1/+0
|\ \ \ \
| * | | | includecheck: delete any duplicate instances of module.hPaul Gortmaker2012-02-283-3/+0
| |/ / /
* | | | Merge tag 'bug-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paul...Linus Torvalds2012-03-241-0/+1
|\ \ \ \
| * | | | bug.h: add include of it to various implicit C usersPaul Gortmaker2012-02-291-0/+1
| |/ / /
* | | | Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-03-233-22/+41
|\ \ \ \
| * | | | usermodehelper: use UMH_WAIT_PROC consistentlyOleg Nesterov2012-03-232-3/+3
| * | | | drivers/staging/telephony/ixj.c: fix warning about sequence pointsUwe Kleine-König2012-03-231-19/+38
| | |/ / | |/| |
* | | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-03-2314-241/+174
|\ \ \ \ | |/ / / |/| | |
| * | | [media] Staging: media: solo6x10: core.c Fix some coding style issueAndrew Miller2012-03-191-16/+16
| * | | [media] staging: Fix comments and some typos in staging/media/*Justin P. Mattock2012-03-196-10/+10
| * | | [media] as102: set optimal eLNA config values for each deviceGianluca Gennari2012-03-193-3/+16
| * | | [media] as102: add __packed attribute to structs defined inside packed structsGianluca Gennari2012-03-193-42/+42
| * | | Merge tag 'v3.3' into staging/for_v3.4Mauro Carvalho Chehab2012-03-19117-40542/+862
| |\| |
| * | | [media] staging: easycap: Fix incorrect commentEzequiel García2012-03-081-3/+2
| * | | [media] staging: easycap: Clean comment style in easycap_usb_probe()Ezequiel García2012-03-081-164/+79
| * | | [media] as102: map URB DMA addresses in the driverGianluca Gennari2012-03-081-0/+2
| * | | [media] staging: go7007: fix mismatch in mutex lock-unlock in [read|write]_re...Alexey Khoroshilov2012-03-081-6/+10
| * | | [media] easycap: Fix mem leak in easycap_usb_probe()Jesper Juhl2012-02-081-0/+1
* | | | Merge tag 'stable/for-linus-3.4' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-03-221-5/+5
|\ \ \ \
| * \ \ \ Merge branch 'stable/cleancache.v13' into linux-nextKonrad Rzeszutek Wilk2012-03-191-5/+5
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | mm: zcache/tmem/cleancache: s/flush/invalidate/Dan Magenheimer2012-01-231-5/+5
* | | | | Merge branch 'drm-nouveau-destage' of git://people.freedesktop.org/~airlied/l...Linus Torvalds2012-03-221-2/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linu...Dave Airlie2012-03-221-2/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | drm/nouveau: move out of staging driversBen Skeggs2012-03-221-2/+0
| | | |_|/ | | |/| |
* | | | | Merge branch 'kmap_atomic' of git://github.com/congwang/linuxLinus Torvalds2012-03-219-111/+64
|\ \ \ \ \
| * | | | | zcache: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-8/+8
| * | | | | zram: remove the second argument of k[un]map_atomic()Cong Wang2012-03-202-42/+41
| * | | | | rtl8192u: remove the second argument of k[un]map_atomic()Cong Wang2012-03-205-59/+13
| * | | | | hv: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-17/+14
| |/ / / /
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-03-201-1/+0
|\ \ \ \ \
| * | | | | Staging: The header linux/module.h is included twice in drivers/staging/iio/d...Jesper Juhl2012-02-101-1/+0
| * | | | | staging: Fix typo in mei/interrupt.cMasanari Iida2012-02-051-1/+1
| * | | | | staging: Fix typo in ieee80211_rx.cMasanari Iida2012-02-051-1/+1
| | |/ / / | |/| | |
| * | | | staging: fix go7007-usb licenseRandy Dunlap2012-02-011-0/+1
| | |_|/ | |/| |
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-03-202-10/+4
|\ \ \ \
| * | | | Staging: wlags49_h2: print MAC via printk format specifierDanny Kukawka2012-02-241-5/+2
| * | | | Staging: ft1000-pcmcia: print MAC via printk format specifierDanny Kukawka2012-02-241-5/+2
| * | | | Staging: et131x: unify return value of .ndo_set_mac_address if address is inv...Danny Kukawka2012-02-231-1/+1
| | |/ / | |/| |
* | | | Merge tag 'usb-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbLinus Torvalds2012-03-203-109/+8
|\ \ \ \
| * | | | USB: serial: serqt_usb2.c: use module_usb_serial_driverGreg Kroah-Hartman2012-02-281-21/+1