summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2013-07-131-1/+1
|\
| * MIPS: OCTEON: Rename Kconfig CAVIUM_OCTEON_REFERENCE_BOARD to CAVIUM_OCTEON_SOCDavid Daney2013-06-101-1/+1
* | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-07-1310-95/+107
|\ \
| * | [media] go7007: fix return 0 for unsupported devices in go7007_usb_probe()Alexey Khoroshilov2013-06-211-2/+2
| * | Merge branch 'linus' into patchworkMauro Carvalho Chehab2013-06-2037-90/+511
| |\ \
| * | | [media] davinci_vpfe: Clean up media entity after unregistering subdevSakari Ailus2013-06-195-14/+14
| * | | [media] staging/media: lirc_imon: fix leaks in imon_probe()Alexey Khoroshilov2013-06-171-3/+4
| * | | [media] solo6x10: reimplement SAA712x setup routineIsmael Luceno2013-06-171-46/+66
| * | | [media] dt3155v4l: remove deprecated current_normHans Verkuil2013-06-171-1/+0
| * | | [media] media: Rename media_entity_remote_source to media_entity_remote_padAndrzej Hajda2013-06-081-6/+6
| * | | [media] solo6x10: Approximate frame intervals with non-standard denominatorIsmael Luceno2013-05-211-23/+15
* | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/l...Linus Torvalds2013-07-1114-3573/+0
|\ \ \ \
| * | | | thermal: introduce TI SoC thermal driverEduardo Valentin2013-05-2814-3562/+0
| |/ / /
* | | | Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-07-101-8/+6
|\ \ \ \
| * | | | firewire: introduce fw_driver.probe and .remove methodsStefan Richter2013-06-091-8/+6
| | |_|/ | |/| |
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-07-096-10/+9
|\ \ \ \
| * \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-07-033-3/+6
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | net: Add missing dependencies on NETDEVICESBen Hutchings2013-06-191-3/+3
| * | | | net: Move MII out from under NET_CORE and hide itBen Hutchings2013-06-191-1/+0
| * | | | staging/rtl8192u: convert skb->tail into skb_tail_pointer(skb)Isaku Yamahata2013-06-171-2/+2
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-06-065-11/+14
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-06-051-19/+2
| |\ \ \ \
| * | | | | net: pass info struct via netdevice notifierJiri Pirko2013-05-284-4/+4
* | | | | | Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2013-07-091-5/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge tag 'v3.10-rc7' into drm-nextDave Airlie2013-06-278-14/+20
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | drm: Drop all the stub gamma_get, gamma_set, load_lut functions from driversVille Syrjälä2013-06-171-5/+0
| | |_|/ / / | |/| | | |
* | | | | | mode_t whack-a-mole...Al Viro2013-07-062-7/+7
* | | | | | lustre: kill the pointless wrapperAl Viro2013-07-057-14/+12
* | | | | | helper for reading ->d_countAl Viro2013-07-051-1/+1
* | | | | | Merge branch 'akpm' (updates from Andrew Morton)Linus Torvalds2013-07-034-5/+4
|\ \ \ \ \ \
| * | | | | | drivers: avoid parsing names as kthread_run() format stringsKees Cook2013-07-031-1/+1
| * | | | | | drivers: avoid format string in dev_set_nameKees Cook2013-07-032-2/+2
| * | | | | | clean up scary strncpy(dst, src, strlen(src)) usesKees Cook2013-07-031-2/+1
* | | | | | | Merge tag 'pm+acpi-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-07-031-2/+3
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'freezer'Rafael J. Wysocki2013-06-281-2/+3
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | binder: use freezable blocking callsColin Cross2013-05-121-2/+3
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'exotic-arch-fixes' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2013-07-031-1/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | console/font: Refactor font support code selection logicGeert Uytterhoeven2013-06-231-0/+2
| * | | | | | Revert "staging/solo6x10: depend on CONFIG_FONTS"Geert Uytterhoeven2013-06-231-1/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-07-032-4/+1
|\ \ \ \ \ \
| * | | | | | comedi: quit wanking with FASYNC in ->release()Al Viro2013-06-291-3/+0
| * | | | | | more open-coded file_inode() callsAl Viro2013-06-291-1/+1
| |/ / / / /
* | | | | | Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2013-07-022-2/+3
|\ \ \ \ \ \
| * | | | | | mailbox/omap: move the OMAP mailbox framework to driversSuman Anna2013-06-112-2/+3
| |/ / / / /
* | | | | | Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2013-07-021-1/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge 3.10-rc7 into driver-core-nextGreg Kroah-Hartman2013-06-243-3/+6
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge 3.10-rc6 into driver-core-nextGreg Kroah-Hartman2013-06-176-30/+16
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Finally eradicate CONFIG_HOTPLUGStephen Rothwell2013-06-031-1/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-07-02833-21362/+278576
|\ \ \ \ \ \
| * | | | | | Revert "Revert "Revert "staging/lustre: drop CONFIG_BROKEN dependency"""Greg Kroah-Hartman2013-06-241-1/+1