summaryrefslogtreecommitdiffstats
path: root/drivers/misc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-07-302-0/+7
|\
| * drivers/misc/lkdtm.c: fix missing allocation failure checkAlan Cox2012-07-301-0/+2
| * drivers/misc/ti-st/st_core.c: missing NULL checkAlan Cox2012-07-301-0/+5
* | Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/...Linus Torvalds2012-07-301-6/+0
|\ \
| * | mfd: Register ab8500 devices using the newly DT:ed MFD APILee Jones2012-07-091-6/+0
* | | Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwmLinus Torvalds2012-07-301-0/+1
|\ \ \ | |_|/ |/| |
| * | pwm: Conflict with legacy PWM APIThierry Reding2012-07-231-0/+1
* | | Merge tag 'char-misc-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2012-07-2611-249/+211
|\ \ \
| * | | mei: use module_pci_driverTomas Winkler2012-07-191-38/+1
| * | | Merge 3.5-rc7 into char-misc-next.Greg Kroah-Hartman2012-07-184-9/+10
| |\ \ \
| * | | | mei: mei_irq_thread_write_handler - line break fixTomas Winkler2012-07-101-28/+16
| * | | | mei: streamline the _mei_irq_thread_close/ioctol functionsTomas Winkler2012-07-101-33/+30
| * | | | mei: introduce mei_data2slots wrapperTomas Winkler2012-07-103-23/+18
| * | | | mei: mei_wd_host_init: update the commentTomas Winkler2012-07-101-1/+2
| * | | | mei: remove write only wariable wd_due_counterTomas Winkler2012-07-104-13/+4
| * | | | mei: mei_device can be const for mei register access functionsTomas Winkler2012-07-101-6/+7
| * | | | mei: revamp host buffer interface functionTomas Winkler2012-06-263-29/+24
| * | | | mei: don't query HCSR for host buffer depthTomas Winkler2012-06-267-21/+24
| * | | | mei: group wd_interface_reg with watchdog variables within struct mei_deviceTomas Winkler2012-06-201-3/+1
| * | | | mei: mei_irq_thread_write_handler check for overflowTomas Winkler2012-06-201-0/+3
| * | | | mei: make mei_write_message more readableTomas Winkler2012-06-201-31/+18
| * | | | mei: check for error codes that mei_flow_ctrl_creds retunsTomas Winkler2012-06-201-2/+2
| * | | | misc: at25: Parse dt settingsAlexandre Pereira da Silva2012-06-141-16/+45
| * | | | misc: hpilo: increase number of max supported channelsCamuso, Tony2012-06-142-13/+24
| | |/ / | |/| |
* | | | Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pciLinus Torvalds2012-07-241-1/+1
|\ \ \ \
| * | | | PCI: do not call pci_set_power_state with PCI_D3coldHuang Ying2012-06-231-1/+1
| |/ / /
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-07-192-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-07-111-2/+2
| |\ \ \
| | * | | sgi-xp: nested calls to spin_lock_irqsave()Dan Carpenter2012-07-111-2/+2
| | | |/ | | |/|
| * / | mei: pci_resume: set IRQF_ONESHOT for msi request_threaded_irqTomas Winkler2012-07-101-1/+1
| |/ /
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-07-1212-2103/+0
|\ \ \ | |/ / |/| |
| * | iwmc3200top: remove driver for unavailable hardwareJohn W. Linville2012-07-1112-2103/+0
| |/
* | misc: mei: set WDIOF_ALARMONLY on mei watchdogTomas Winkler2012-06-131-1/+1
* | misc: mei: Disable MSI when IRQ registration failsSamuel Ortiz2012-06-131-2/+2
* | misc: mei: fix stalled readTomas Winkler2012-06-131-1/+1
* | misc: mei: unregister misc device in pci_remove functionTomas Winkler2012-06-131-1/+2
* | misc: mei: set IRQF_ONESHOT for msi request_threaded_irqTomas Winkler2012-06-131-1/+1
|/
* Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/...Linus Torvalds2012-05-291-0/+6
|\
| * mfd: Enable Device Tree support in the ab8500-pwm driverLee Jones2012-05-201-0/+6
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-05-221-3/+3
|\ \
| * | c2port: fix bogus Kconfig "default no"Paul Bolle2012-05-071-3/+3
| |/
* | Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-05-2213-0/+5828
|\ \
| * | mei: move doc files Documentation/misc-devices/meiTomas Winkler2012-05-093-705/+0
| * | mei: export mei.h for the user spaceTomas Winkler2012-05-0911-120/+9
| * | mei: pci_probe/remove: use dev_err instead of printk(KERN_ERRTomas Winkler2012-05-091-8/+8
| * | mei: use pr_err instead of printk(KERN_ERRTomas Winkler2012-05-091-1/+1
| * | Staging: mei: move the mei code out of stagingGreg Kroah-Hartman2012-05-0117-0/+6644
| |/
* | Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2012-05-223-502/+0
|\ \
| * | misc: MAX8997: Remove max8997-muic driverChanwoo Choi2012-05-093-504/+0
| |/
* | Support M95040 SPI EEPROMIvo Sieben2012-04-181-3/+16