diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 10:13:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 10:13:48 -0700 |
| commit | da62aa69c181e3bd465a5c868ece166921a81e14 (patch) | |
| tree | 5f1a3e234dd791099ba8761f79442b0ac6f664c0 /drivers/power/collie_battery.c | |
| parent | f1ebdd60cc73ed36fd977f7e719ce70d2f5cd1c0 (diff) | |
| parent | 76a7bd81130646459dfded1845e0d511488a6afa (diff) | |
| download | blackbird-op-linux-da62aa69c181e3bd465a5c868ece166921a81e14.tar.gz blackbird-op-linux-da62aa69c181e3bd465a5c868ece166921a81e14.zip | |
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core
* 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core: (34 commits)
i7core_edac: return -ENODEV when devices were already probed
i7core_edac: properly terminate pci_dev_table
i7core_edac: Avoid PCI refcount to reach zero on successive load/reload
i7core_edac: Fix refcount error at PCI devices
i7core_edac: it is safe to i7core_unregister_mci() when mci=NULL
i7core_edac: Fix an oops at i7core probe
i7core_edac: Remove unused member channels in i7core_pvt
i7core_edac: Remove unused arg csrow from get_dimm_config
i7core_edac: Reduce args of i7core_register_mci
i7core_edac: Introduce i7core_unregister_mci
i7core_edac: Use saved pointers
i7core_edac: Check probe counter in i7core_remove
i7core_edac: Call pci_dev_put() when alloc_i7core_dev() failed
i7core_edac: Fix error path of i7core_register_mci
i7core_edac: Fix order of lines in i7core_register_mci
i7core_edac: Always do get/put for all devices
i7core_edac: Introduce i7core_pci_ctl_create/release
i7core_edac: Introduce free_i7core_dev
i7core_edac: Introduce alloc_i7core_dev
i7core_edac: Reduce args of i7core_get_onedevice
...
Diffstat (limited to 'drivers/power/collie_battery.c')
0 files changed, 0 insertions, 0 deletions
